diff --git a/src/main.cpp b/src/main.cpp
index 7fc1d2cf2..9e46021c9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -774,17 +774,8 @@ void setup()
 
 #if defined(USE_SH1107_128_64)
     screen_model = meshtastic_Config_DisplayConfig_OledType_OLED_SH1107; // keep dimension of 128x64
-    screen_geometry = GEOMETRY_128_64;
 #endif
 
-    // if we have one of the fixed overrides in the settings, adjust display type accordingly.
-    if (screen_model == meshtastic_Config_DisplayConfig_OledType_OLED_SH1107) {
-        screen_geometry = GEOMETRY_128_128;
-    } else if (screen_model == meshtastic_Config_DisplayConfig_OledType_OLED_SH1107_128_64) {
-        screen_model = meshtastic_Config_DisplayConfig_OledType_OLED_SH1107;
-        screen_geometry = GEOMETRY_128_64;
-    }
-
 #if !MESHTASTIC_EXCLUDE_I2C
 #if !defined(ARCH_STM32WL)
     if (acc_info.type != ScanI2C::DeviceType::NONE) {
@@ -830,7 +821,7 @@ void setup()
 #elif !defined(ARCH_ESP32) // ARCH_RP2040
     SPI.begin();
 #else
-    // ESP32
+        // ESP32
 #if defined(HW_SPI1_DEVICE)
     SPI1.begin(LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS);
     LOG_DEBUG("SPI1.begin(SCK=%d, MISO=%d, MOSI=%d, NSS=%d)", LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS);