diff --git a/src/graphics/Screen.h b/src/graphics/Screen.h
index 3988fa1a8..c82653284 100644
--- a/src/graphics/Screen.h
+++ b/src/graphics/Screen.h
@@ -34,7 +34,7 @@ class Screen
 
 #ifdef USE_ST7567
 #include <ST7567Wire.h>
-#elif defined(USE_SH1106)
+#elif defined(USE_SH1106) || defined(USE_SH1107)
 #include <SH1106Wire.h>
 #elif defined(USE_SSD1306)
 #include <SSD1306Wire.h>
@@ -342,10 +342,7 @@ class Screen : public concurrency::OSThread
 
     /// Display device
 
-// #ifdef RAK4630
-//     EInkDisplay dispdev;
-//     AutoOLEDWire dispdev_oled;
-#ifdef USE_SH1106
+#if defined(USE_SH1106) || defined(USE_SH1107)
     SH1106Wire dispdev;
 #elif defined(USE_SSD1306)
     SSD1306Wire dispdev;
diff --git a/src/main.cpp b/src/main.cpp
index 76a6a6b6f..409bb3e25 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -305,6 +305,10 @@ void setup()
     if (config.display.oled != Config_DisplayConfig_OledType_OLED_AUTO)
         screen_model = config.display.oled;
 
+#if defined(USE_SH1107)
+    screen_model = Config_DisplayConfig_OledType_OLED_SH1107; // set dimension of 128x128
+#endif
+
     // Init our SPI controller (must be before screen and lora)
     initSPI();
 #ifndef ARCH_ESP32