diff --git a/Makefile b/Makefile
index 5830dbc562..9be0e40f69 100644
--- a/Makefile
+++ b/Makefile
@@ -212,6 +212,7 @@ NAZE_SRC	 = startup_stm32f10x_md_gcc.S \
 		   drivers/bus_spi.c \
 		   drivers/bus_i2c_stm32f10x.c \
 		   drivers/compass_hmc5883l.c \
+		   drivers/display_ug2864hsweg01.h \
 		   drivers/gpio_stm32f10x.c \
 		   drivers/inverter.c \
 		   drivers/light_led_stm32f10x.c \
diff --git a/src/main/io/display.c b/src/main/io/display.c
index b4f5c36453..1d81614418 100644
--- a/src/main/io/display.c
+++ b/src/main/io/display.c
@@ -22,6 +22,8 @@
 
 #include "build_config.h"
 
+#ifdef DISPLAY
+
 #include "drivers/system.h"
 #include "drivers/display_ug2864hsweg01.h"
 
@@ -70,3 +72,5 @@ void displayInit(void)
     delay(20);
     ug2864hsweg01InitI2C();
 }
+
+#endif
diff --git a/src/main/main.c b/src/main/main.c
index 9ed2965311..6567db82e1 100755
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -139,7 +139,9 @@ void init(void)
 
     initBoardAlignment(&masterConfig.boardAlignment);
 
+#ifdef DISPLAY
     displayInit();
+#endif
 
     // We have these sensors; SENSORS_SET defined in board.h depending on hardware platform
     sensorsSet(SENSORS_SET);
diff --git a/src/main/mw.c b/src/main/mw.c
index 5fe860024d..c439a0d4bc 100755
--- a/src/main/mw.c
+++ b/src/main/mw.c
@@ -432,9 +432,11 @@ void executePeriodicTasks(void)
         }
         break;
 #endif
+#ifdef DISPLAY
     case UPDATE_DISPLAY_TASK:
         updateDisplay();
         break;
+#endif
     }
 
     if (periodicTaskIndex >= PERIODIC_TASK_COUNT) {
diff --git a/src/main/target/EUSTM32F103RC/target.h b/src/main/target/EUSTM32F103RC/target.h
index c802fc84bc..4775e07a59 100644
--- a/src/main/target/EUSTM32F103RC/target.h
+++ b/src/main/target/EUSTM32F103RC/target.h
@@ -22,6 +22,7 @@
 #define GYRO
 #define MAG
 #define SONAR
+#define DISPLAY
 
 #define USE_USART1
 #define USE_USART2
diff --git a/src/main/target/NAZE/target.h b/src/main/target/NAZE/target.h
index 7d6d6846a5..85d2a8ca17 100644
--- a/src/main/target/NAZE/target.h
+++ b/src/main/target/NAZE/target.h
@@ -46,6 +46,7 @@
 #define LED0
 #define LED1
 #define INVERTER
+#define DISPLAY
 
 #define USE_USART1
 #define USE_USART2