diff --git a/sonoff/xdsp_02_ssd1306.ino b/sonoff/xdsp_02_ssd1306.ino
index 42f3fa005..fbbbf0acb 100755
--- a/sonoff/xdsp_02_ssd1306.ino
+++ b/sonoff/xdsp_02_ssd1306.ino
@@ -178,16 +178,15 @@ bool Xdsp02(byte function)
       SSD1306InitDriver();
     }
     else if (XDSP_02 == Settings.display_model) {
-
       switch (function) {
-        case FUNC_DISPLAY_MODEL:
-          result = true;
-          break;
 #ifdef USE_DISPLAY_MODES1TO5
         case FUNC_DISPLAY_EVERY_SECOND:
           Ssd1306Refresh();
           break;
 #endif  // USE_DISPLAY_MODES1TO5
+        case FUNC_DISPLAY_MODEL:
+          result = true;
+          break;
       }
     }
   }
diff --git a/sonoff/xdsp_10_RA8876.ino b/sonoff/xdsp_10_RA8876.ino
index afe8691af..8effd5d06 100644
--- a/sonoff/xdsp_10_RA8876.ino
+++ b/sonoff/xdsp_10_RA8876.ino
@@ -211,7 +211,7 @@ if (2 == ctouch_counter) {
   }
 }
 }
-#endif USE_TOUCH_BUTTONS
+#endif  // USE_TOUCH_BUTTONS
 /*
 void testall() {
 ra8876->clearScreen(0);