diff --git a/src/PowerFSM.cpp b/src/PowerFSM.cpp
index 322b877ff..29aacd3f3 100644
--- a/src/PowerFSM.cpp
+++ b/src/PowerFSM.cpp
@@ -353,7 +353,7 @@ void PowerFSM_setup()
 
     powerFSM.add_transition(&stateDARK, &stateDARK, EVENT_CONTACT_FROM_PHONE, NULL, "Contact from phone");
 
-#ifdef USE_EINK
+#if defined(USE_EINK) || defined(USE_EPD)
     // Allow E-Ink devices to suppress the screensaver, if screen timeout set to 0
     if (config.display.screen_on_secs > 0)
 #endif
diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
index c80fef5ab..e8abc2685 100644
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -683,7 +683,7 @@ void Screen::setup()
     handleSetOn(true);
     determineResolution(dispdev->height(), dispdev->width());
     ui->update();
-#if defined(USE_EINK) || defined(USE_EPD)
+#if !defined(USE_EINK) && !defined(USE_EPD)
     ui->update(); // Some SSD1306 clones drop the first draw, so run twice
 #endif
     serialSinceMsec = millis();
@@ -810,7 +810,7 @@ int32_t Screen::runOnce()
         static const int bootOEMFrameCount = sizeof(bootOEMFrames) / sizeof(bootOEMFrames[0]);
         ui->setFrames(bootOEMFrames, bootOEMFrameCount);
         ui->update();
-#ifndef USE_EINK
+#if !defined(USE_EINK) && !defined(USE_EPD)
         ui->update();
 #endif
         showingOEMBootScreen = false;
@@ -1063,7 +1063,7 @@ void Screen::setFrames(FrameFocus focus)
     normalFrames[numframes++] = graphics::MessageRenderer::drawTextMessageFrame;
     indicatorIcons.push_back(icon_mail);
 
-#ifndef USE_EINK
+#if !defined(USE_EINK) && !defined(USE_EPD)
     if (!hiddenFrames.nodelist) {
         fsi.positions.nodelist = numframes;
         normalFrames[numframes++] = graphics::NodeListRenderer::drawDynamicNodeListScreen;
diff --git a/src/graphics/draw/MenuHandler.cpp b/src/graphics/draw/MenuHandler.cpp
index bd647c3d8..822f097a7 100644
--- a/src/graphics/draw/MenuHandler.cpp
+++ b/src/graphics/draw/MenuHandler.cpp
@@ -1491,11 +1491,11 @@ void menuHandler::FrameToggles_menu()
     // Track last selected index (not enum value!)
     static int lastSelectedIndex = 0;
 
-#ifndef USE_EINK
+#if !defined(USE_EINK) && !defined(USE_EPD)
     optionsArray[options] = screen->isFrameHidden("nodelist") ? "Show Node List" : "Hide Node List";
     optionsEnumArray[options++] = nodelist;
 #endif
-#ifdef USE_EINK
+#if defined(USE_EINK) || defined(USE_EPD)
     optionsArray[options] = screen->isFrameHidden("nodelist_lastheard") ? "Show NL - Last Heard" : "Hide NL - Last Heard";
     optionsEnumArray[options++] = nodelist_lastheard;
     optionsArray[options] = screen->isFrameHidden("nodelist_hopsignal") ? "Show NL - Hops/Signal" : "Hide NL - Hops/Signal";