diff --git a/src/main/io/osd.c b/src/main/io/osd.c
index 2691e44638..b398b9118e 100755
--- a/src/main/io/osd.c
+++ b/src/main/io/osd.c
@@ -397,7 +397,9 @@ void osdInit(void)
         }
     }
 
+#ifdef CMS
     cmsInit();
+#endif
 
     sprintf(string_buffer, "BF VERSION: %s", FC_VERSION_STRING);
     max7456Write(5, 6, string_buffer);
@@ -405,7 +407,9 @@ void osdInit(void)
     max7456Write(12, 8, STARTUP_HELP_TEXT2);
     max7456Write(12, 9, STARTUP_HELP_TEXT3);
 
+#ifdef CMS
     cmsScreenResync(); // Was max7456RefreshAll(); may be okay.
+#endif
 
     refreshTimeout = 4 * REFRESH_1S;
 }
diff --git a/src/main/target/OMNIBUS/target.h b/src/main/target/OMNIBUS/target.h
index 570ffc3c6a..d059b58d11 100644
--- a/src/main/target/OMNIBUS/target.h
+++ b/src/main/target/OMNIBUS/target.h
@@ -95,12 +95,13 @@
 // Use external OSD to run CMS
 //#define CANVAS
 
-#define OLEDCMS
+// USE I2C OLED display to run CMS
+//#define OLEDCMS
 
 // OSD define info:
 //   feature name (includes source) -> MAX_OSD, used in target.mk
 // include the osd code
-//#define OSD
+#define OSD
 
 // include the max7456 driver
 #define USE_MAX7456
diff --git a/src/main/target/SPRACINGF3/target.h b/src/main/target/SPRACINGF3/target.h
index 3b888267c0..a00f3a84bc 100644
--- a/src/main/target/SPRACINGF3/target.h
+++ b/src/main/target/SPRACINGF3/target.h
@@ -134,4 +134,7 @@
 #define CMS
 
 // Use external OSD to run CMS
-#define CANVAS
+//#define CANVAS
+
+// USE I2C OLED display to run CMS
+#define OLEDCMS