diff --git a/src/plugins/Display/Display_Mono_128X64.h b/src/plugins/Display/Display_Mono_128X64.h
index 7b7b7920..afb581dd 100644
--- a/src/plugins/Display/Display_Mono_128X64.h
+++ b/src/plugins/Display/Display_Mono_128X64.h
@@ -49,9 +49,9 @@ class DisplayMono128X64 : public DisplayMono {
             /*
             mDisplayData->nrSleeping = 10;
             mDisplayData->nrProducing = 10;
-            mDisplayData->totalPower = 54321.9; // W
-            mDisplayData->totalYieldDay = 4321.9; // Wh
-            mDisplayData->totalYieldTotal = 4321.9; // kWh
+            mDisplayData->totalPower = 15432.9; // W
+            mDisplayData->totalYieldDay = 14321.9; // Wh
+            mDisplayData->totalYieldTotal = 15432.9; // kWh
             mDisplay->drawPixel(0, 0);
             mDisplay->drawPixel(mDispWidth-1, 0);
             mDisplay->drawPixel(0, mDispHeight-1);
@@ -63,8 +63,8 @@ class DisplayMono128X64 : public DisplayMono {
 
             // print total power
             if (mDisplayData->nrProducing > 0) {
-                if (mDisplayData->totalPower > 999)
-                    snprintf(mFmtText, DISP_FMT_TEXT_LEN, "%.1f kW", (mDisplayData->totalPower / 1000.0));
+                if (mDisplayData->totalPower > 9999.0)
+                    snprintf(mFmtText, DISP_FMT_TEXT_LEN, "%.2f kW", (mDisplayData->totalPower / 1000.0));
                 else
                     snprintf(mFmtText, DISP_FMT_TEXT_LEN, "%.0f W", mDisplayData->totalPower);
 
@@ -120,16 +120,16 @@ class DisplayMono128X64 : public DisplayMono {
             mDisplay->drawStr(16 + mPixelshift, mLineYOffsets[l_YieldDay],   "I");    // day symbol
             mDisplay->drawStr(16 + mPixelshift, mLineYOffsets[l_YieldTotal], "D");    // total symbol
 
-            if (mDisplayData->totalYieldDay > 999.0)
-                snprintf(mFmtText, DISP_FMT_TEXT_LEN, "%.1f kWh", mDisplayData->totalYieldDay / 1000.0);
+            if (mDisplayData->totalYieldDay > 9999.0)
+                snprintf(mFmtText, DISP_FMT_TEXT_LEN, "%.2f kWh", mDisplayData->totalYieldDay / 1000.0);
             else
                 snprintf(mFmtText, DISP_FMT_TEXT_LEN, "%.0f Wh", mDisplayData->totalYieldDay);
             printText(mFmtText, l_YieldDay, 0xff);
 
-            if (mDisplayData->totalYieldTotal > 999.0)
-                snprintf(mFmtText, DISP_FMT_TEXT_LEN, "%.1f MWh", mDisplayData->totalYieldTotal / 1000.0);
+            if (mDisplayData->totalYieldTotal > 9999.0)
+                snprintf(mFmtText, DISP_FMT_TEXT_LEN, "%.2f MWh", mDisplayData->totalYieldTotal / 1000.0);
             else
-                snprintf(mFmtText, DISP_FMT_TEXT_LEN, "%.1f kWh", mDisplayData->totalYieldTotal);
+                snprintf(mFmtText, DISP_FMT_TEXT_LEN, "%.0f kWh", mDisplayData->totalYieldTotal);
             printText(mFmtText, l_YieldTotal, 0xff);
 
             // draw dynamic RSSI bars
diff --git a/src/plugins/Display/Display_Mono_84X48.h b/src/plugins/Display/Display_Mono_84X48.h
index df27a414..7e5c157f 100644
--- a/src/plugins/Display/Display_Mono_84X48.h
+++ b/src/plugins/Display/Display_Mono_84X48.h
@@ -36,8 +36,8 @@ class DisplayMono84X48 : public DisplayMono {
             /*
             mDisplayData->nrSleeping = 10;
             mDisplayData->nrProducing = 10;
-            mDisplayData->totalPower = 111.91; // W
-            mDisplayData->totalYieldDay = 54321.9; // Wh
+            mDisplayData->totalPower = 19897.6; // W
+            mDisplayData->totalYieldDay = 15521.9; // Wh
             mDisplayData->totalYieldTotal = 654321.9; // kWh
             mDisplay->drawPixel(0, 0);
             mDisplay->drawPixel(mDispWidth-1, 0);
@@ -47,8 +47,8 @@ class DisplayMono84X48 : public DisplayMono {
 
             // print total power
             if (mDisplayData->nrProducing > 0) {
-                if (mDisplayData->totalPower > 999)
-                    snprintf(mFmtText, DISP_FMT_TEXT_LEN, "%.1f kW", (mDisplayData->totalPower / 1000));
+                if (mDisplayData->totalPower > 9999.0)
+                    snprintf(mFmtText, DISP_FMT_TEXT_LEN, "%.2f kW", (mDisplayData->totalPower / 1000.0));
                 else
                     snprintf(mFmtText, DISP_FMT_TEXT_LEN, "%.0f W", mDisplayData->totalPower);
 
@@ -84,16 +84,16 @@ class DisplayMono84X48 : public DisplayMono {
             printText("\x88", l_YieldDay,   10);        // day symbol
             printText("\x83", l_YieldTotal, 10);        // total symbol
 
-            if (mDisplayData->totalYieldDay > 999.0)
-                snprintf(mFmtText, DISP_FMT_TEXT_LEN, "%.1f kWh", mDisplayData->totalYieldDay / 1000.0);
+            if (mDisplayData->totalYieldDay > 9999.0)
+                snprintf(mFmtText, DISP_FMT_TEXT_LEN, "%.2f kWh", mDisplayData->totalYieldDay / 1000.0);
             else
                 snprintf(mFmtText, DISP_FMT_TEXT_LEN, "%.0f Wh", mDisplayData->totalYieldDay);
             printText(mFmtText, l_YieldDay, 0xff);
 
-            if (mDisplayData->totalYieldTotal > 999.0)
-                snprintf(mFmtText, DISP_FMT_TEXT_LEN, "%.1f MWh", mDisplayData->totalYieldTotal / 1000.0);
+            if (mDisplayData->totalYieldTotal > 9999.0)
+                snprintf(mFmtText, DISP_FMT_TEXT_LEN, "%.2f MWh", mDisplayData->totalYieldTotal / 1000.0);
             else
-                snprintf(mFmtText, DISP_FMT_TEXT_LEN, "%.1f kWh", mDisplayData->totalYieldTotal);
+                snprintf(mFmtText, DISP_FMT_TEXT_LEN, "%.0f kWh", mDisplayData->totalYieldTotal);
             printText(mFmtText, l_YieldTotal, 0xff);
 
             // draw dynamic Nokia RSSI bars