diff --git a/src/helpers/ui/GxEPDDisplay.cpp b/src/helpers/ui/GxEPDDisplay.cpp
index 610b8541f..332157eb8 100644
--- a/src/helpers/ui/GxEPDDisplay.cpp
+++ b/src/helpers/ui/GxEPDDisplay.cpp
@@ -71,9 +71,7 @@ void GxEPDDisplay::turnOn() {
   expander.digitalWrite(EXP_PIN_BACKLIGHT, HIGH);
 #endif
   if (!_isOn) {
-    forceFullRefresh();
     _isOn = true;
-    last_display_crc_value=0;
   }
 }
 
@@ -84,10 +82,12 @@ void GxEPDDisplay::turnOff() {
   expander.digitalWrite(EXP_PIN_BACKLIGHT, LOW);
 #endif
   _isOn = false;
-  display.setFullWindow();
-  display.fillScreen(GxEPD_WHITE);
-  display.display(true);
-  forceFullRefresh();
+  // do full refresh before powering off to clear screen
+  // no full refresh needed at wakeup
+  display.clearScreen(0xFF); // Clears microcontroller side RAM
+  display.writeScreenBuffer(0xFF); // Forces 0xFF (White) into the display controller's history registers
+  resetPartialRefreshCounter();
+  last_display_crc_value=0;
   display.hibernate();
 }