diff --git a/src/ButtonThread.h b/src/ButtonThread.h
index c1fd770bc..088642099 100644
--- a/src/ButtonThread.h
+++ b/src/ButtonThread.h
@@ -159,7 +159,7 @@ class ButtonThread : public concurrency::OSThread
 
     static void userButtonDoublePressed()
     {
-#if defined(USE_EINK)
+#if defined(USE_EINK) && defined(PIN_EINK_EN)
         digitalWrite(PIN_EINK_EN, digitalRead(PIN_EINK_EN) == LOW);
 #endif
     }
diff --git a/src/Power.cpp b/src/Power.cpp
index d3782a2a4..7443fc428 100644
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -234,6 +234,9 @@ bool Power::setup()
 void Power::shutdown()
 {
 
+#if defined(USE_EINK) && defined(PIN_EINK_EN)
+    digitalWrite(PIN_EINK_EN, LOW); //power off backlight first
+#endif
 
 #ifdef HAS_PMU
     DEBUG_MSG("Shutting down\n");