diff --git a/quantum/visualizer/visualizer.c b/quantum/visualizer/visualizer.c
index abca22d8..dfa2ff4e 100644
--- a/quantum/visualizer/visualizer.c
+++ b/quantum/visualizer/visualizer.c
@@ -456,9 +456,7 @@ static DECLARE_THREAD_FUNCTION(visualizerThread, arg) {
 }
 
 void visualizer_init(void) {
-#ifdef LCD_ENABLE
     gfxInit();
-#endif
 
 #ifdef LCD_BACKLIGHT_ENABLE
     lcd_backlight_init();
diff --git a/quantum/visualizer/visualizer.mk b/quantum/visualizer/visualizer.mk
index 149968de..379496fb 100644
--- a/quantum/visualizer/visualizer.mk
+++ b/quantum/visualizer/visualizer.mk
@@ -42,7 +42,7 @@ endif
 
 ifdef LED_ENABLE
 SRC += $(VISUALIZER_DIR)/led_test.c
-UDEFS += -DLED_ENABLE
+OPT_DEFS += -DLED_ENABLE
 endif
 
 include $(GFXLIB)/gfx.mk
diff --git a/tmk_core/protocol/chibios/main.c b/tmk_core/protocol/chibios/main.c
index 6bf9c166..36fd45d4 100644
--- a/tmk_core/protocol/chibios/main.c
+++ b/tmk_core/protocol/chibios/main.c
@@ -104,13 +104,14 @@ int main(void) {
   /* init printf */
   init_printf(NULL,sendchar_pf);
 
+#ifdef SERIAL_LINK_ENABLE
+  init_serial_link();
+#endif
+
 #ifdef VISUALIZER_ENABLE
   visualizer_init();
 #endif
 
-#ifdef SERIAL_LINK_ENABLE
-  init_serial_link();
-#endif
 
   host_driver_t* driver = NULL;