diff --git a/src/driver/drv_charts.c b/src/driver/drv_charts.c
index dc9ef5545..820daeecb 100644
--- a/src/driver/drv_charts.c
+++ b/src/driver/drv_charts.c
@@ -371,7 +371,7 @@ void Chart_DisplayLabel(float *val, time_t *time, void *userData) {
 		poststr(request, ",");
 	}
 	request->userCounter++;
-	snprintf(buffer, sizeof(buffer), "new Date(%ld * 1000).toLocaleTimeString()", (long)(*time));
+	snprintf(buffer, sizeof(buffer), "%ld", (long)(*time));					// don't transmit too much data, use only the timestamps here and handle conversion later  ....
 	poststr(request, buffer);
 }
 void Chart_DisplayData(float *val, time_t *time, void *userData) {
@@ -404,26 +404,48 @@ void Chart_Display(http_request_t *request, chart_t *s) {
 		}
 	}
 
-	poststr(request, "<canvas id=\"myChart\" width=\"400\" height=\"200\"></canvas>");
+/*
+	// on every "state" request, JS code will be loaded and canvas is redrawn
+	// this leads to a flickering graph
+	// so put this right below the "state" div
+	// with a "#ifdef 
+	// drawback : We need to take care, if driver is loaded and canvas will be displayed only on a reload of the page
+	// or we might try and hide/unhide it ...
+	poststr(request, "<canvas id=\"obkChart\" width=\"400\" height=\"200\"></canvas>");
 	poststr(request, "<script src=\"https://cdn.jsdelivr.net/npm/chart.js\"></script>");
-
+*/
+	poststr(request, "<input type='hidden' id='chartlabels' value='");
+	request->userCounter = 0;
+	Chart_Iterate(s, 0, Chart_DisplayLabel, request);
+	poststr(request, "'>");
+	for (int i = 0; i < s->numVars; i++) {
+		hprintf255(request, "<input type='hidden' id='chartdata%i' value='",i);
+		request->userCounter = 0;
+		Chart_Iterate(s, i,  Chart_DisplayData, request);
+		poststr(request, "'>");
+	}
 	poststr(request, "<script>");
 	poststr(request, "function cha() {");
 	poststr(request, "console.log('Initializing chart');");
-	poststr(request, "if (window.myChartInstance) {");
-	poststr(request, "    window.myChartInstance.destroy();");
+	poststr(request, "if (window.obkChartInstance) {");
+	poststr(request, "    window.obkChartInstance.destroy();");
 	poststr(request, "}");
-	poststr(request, "var ctx = document.getElementById('myChart').getContext('2d');");
+	poststr(request, "var ctx = document.getElementById('obkChart');");
+	poststr(request, "if (ctx.style.display=='none') ctx.style.display='block';");
+	poststr(request, "ctx =ctx.getContext('2d');");
 
+/*
 	poststr(request, "var labels = [");
 	request->userCounter = 0;
 	Chart_Iterate(s, 0, Chart_DisplayLabel, request);
 	poststr(request, "];");
-
-	poststr(request, "window.myChartInstance = new Chart(ctx, {");
+*/
+	poststr(request, "var labels=document.getElementById('chartlabels').value.split(/\s*,\s*/).map(Number);");
+	
+	poststr(request, "window.obkChartInstance = new Chart(ctx, {");
 	poststr(request, "    type: 'line',");
 	poststr(request, "    data: {");
-	poststr(request, "        labels: labels,");  
+	poststr(request, "        labels: labels.map((x)=>new Date(x * 1000).toLocaleTimeString()),");  	// we transmitted only timestamps, let Javascript do the work to convert them ;-)
 	poststr(request, "        datasets: [");
 	for (int i = 0; i < s->numVars; i++) {
 		if (i) {
@@ -431,10 +453,14 @@ void Chart_Display(http_request_t *request, chart_t *s) {
 		}
 		poststr(request, "{");
 		hprintf255(request, "            label: '%s',", s->vars[i].title);
+/*
 		poststr(request, "            data: [");
 		request->userCounter = 0;
 		Chart_Iterate(s, i,  Chart_DisplayData, request);
 		poststr(request, "],");
+*/
+
+		hprintf255(request, "            data: document.getElementById('chartdata%i').value.split(/\s*,\s*/).map(Number),",i);
 		if (i == 2) {
 			poststr(request, "                borderColor: 'rgba(155, 33, 55, 1)',");
 		}
@@ -451,6 +477,7 @@ void Chart_Display(http_request_t *request, chart_t *s) {
 	poststr(request, "]");
 	poststr(request, "    },");
 	poststr(request, "    options: {");
+	poststr(request, "        animation: false,");		// for me it's annoying, if on every refresh the graph is "animated"
 	poststr(request, "        scales: {");
 	poststr(request, "            x: {");
 	poststr(request, "                type: 'category',");  
diff --git a/src/driver/drv_test_charts.c b/src/driver/drv_test_charts.c
index 539d1444b..735e43dcd 100644
--- a/src/driver/drv_test_charts.c
+++ b/src/driver/drv_test_charts.c
@@ -20,16 +20,16 @@ void DRV_Test_Charts_AddToHtmlPage(http_request_t *request) {
 		temperature[i] = 20.0 + (i % 5);
 		humidity[i] = 80.0 + (i % 3);
 	}
-	poststr(request, "<canvas id=\"myChart\" width=\"400\" height=\"200\"></canvas>");
+	poststr(request, "<canvas id=\"obkChart\" width=\"400\" height=\"200\"></canvas>");
 	poststr(request, "<script src=\"https://cdn.jsdelivr.net/npm/chart.js\"></script>");
 
 	poststr(request, "<script>");
 	poststr(request, "function cha() {");
 	poststr(request, "console.log('Initializing chart');");
-	poststr(request, "if (window.myChartInstance) {");
-	poststr(request, "    window.myChartInstance.destroy();");
+	poststr(request, "if (window.obkChartInstance) {");
+	poststr(request, "    window.obkChartInstance.destroy();");
 	poststr(request, "}");
-	poststr(request, "var ctx = document.getElementById('myChart').getContext('2d');");
+	poststr(request, "var ctx = document.getElementById('obkChart').getContext('2d');");
 
 	poststr(request, "var labels = [");
 	for (size_t i = 0; i < 16; i++) {
@@ -41,7 +41,7 @@ void DRV_Test_Charts_AddToHtmlPage(http_request_t *request) {
 	}
 	poststr(request, "];");
 
-	poststr(request, "window.myChartInstance = new Chart(ctx, {");
+	poststr(request, "window.obkChartInstance = new Chart(ctx, {");
 	poststr(request, "    type: 'line',");
 	poststr(request, "    data: {");
 	poststr(request, "        labels: labels,");
diff --git a/src/httpserver/http_fns.c b/src/httpserver/http_fns.c
index 366e70832..2a9386f59 100644
--- a/src/httpserver/http_fns.c
+++ b/src/httpserver/http_fns.c
@@ -896,6 +896,22 @@ typedef enum {
 		hprintf255(request, "</h5>");
 	}
 
+#if ENABLE_DRIVER_CHARTS		
+/*	// moved from drv_charts.c:
+	// on every "state" request, JS code will be loaded and canvas is redrawn
+	// this leads to a flickering graph
+	// so put this right below the "state" div
+	// with a "#ifdef 
+	// drawback : We need to take care, if driver is loaded and canvas will be displayed only on a reload of the page
+	// or we might try and hide/unhide it ...
+*/
+	// since we can't simply stop showing the graph in updated status, we need to "hide" it if driver was stopped
+	if (! DRV_IsRunning("Charts")) {
+		poststr(request, "<style onload=\"document.getElementById('obkChart').style.display='none'\"></style>");		
+	};
+
+#endif
+
 #if WINDOWS
 #elif PLATFORM_BL602
 #elif PLATFORM_W600 || PLATFORM_W800
@@ -915,6 +931,22 @@ typedef enum {
 	// for normal page loads, show the rest of the HTML
 	if (!http_getArg(request->url, "state", tmpA, sizeof(tmpA))) {
 		poststr(request, "</div>"); // end div#state
+#if ENABLE_DRIVER_CHARTS		
+/*	// moved from drv_charts.c:
+	// on every "state" request, JS code will be loaded and canvas is redrawn
+	// this leads to a flickering graph
+	// so put this right below the "state" div
+	// with a "#ifdef 
+	// drawback : We need to take care, if driver is loaded and canvas will be displayed only on a reload of the page
+	// or we might try and hide/unhide it ...
+*/
+//	if (DRV_IsRunning("Charts")) {
+		poststr(request, "<canvas style='display: none' id=\"obkChart\" width=\"400\" height=\"200\"></canvas>");
+		poststr(request, "<script src=\"https://cdn.jsdelivr.net/npm/chart.js\"></script>");
+//	};
+
+#endif
+
 
 		// Shared UI elements 
 		poststr(request, "<form action=\"cfg\"><input type=\"submit\" value=\"Config\"/></form>");