diff --git a/src/output/hub75/1bit_buffer.h b/src/output/hub75/1bit_buffer.h
index 6c7c74b..e158fee 100644
--- a/src/output/hub75/1bit_buffer.h
+++ b/src/output/hub75/1bit_buffer.h
@@ -64,6 +64,7 @@ void _displaySmallBuffer()
         _set_color((*(((uint8_t *)(index)) + (sizeof(uint8_t) * 2))));
         Clock;
 
+#if PANEL_X > 16
         ++index;
         _set_color(*(uint8_t *)(index) << (uint8_t)2);
         Clock;
@@ -101,6 +102,7 @@ void _displaySmallBuffer()
         Clock;
         _set_color((*(((uint8_t *)(index)) + (sizeof(uint8_t) * 2))));
         Clock;
+#endif
 #if PANEL_X > 32
         ++index;
         _set_color(*(uint8_t *)(index) << (uint8_t)2);
diff --git a/src/output/hub75/2bit_buffer.h b/src/output/hub75/2bit_buffer.h
index f2945d6..994fdd5 100644
--- a/src/output/hub75/2bit_buffer.h
+++ b/src/output/hub75/2bit_buffer.h
@@ -71,6 +71,7 @@ void _displayBigBuffer()
         _set_color((*(((uint8_t *)(index)) + (sizeof(uint8_t) * 5))));
         Clock;
 
+#if PANEL_X > 16
         ++index;
         _set_color((uint8_t)((*((uint16_t *)(index)) >> (uint8_t)4)));
         Clock;
@@ -108,7 +109,7 @@ void _displayBigBuffer()
         Clock;
         _set_color((*(((uint8_t *)(index)) + (sizeof(uint8_t) * 5))));
         Clock;
-
+#endif
 #if PANEL_X > 32
         ++index;
         _set_color((uint8_t)((*((uint16_t *)(index)) >> (uint8_t)4)));
@@ -255,6 +256,7 @@ void _displayBigBuffer()
         _set_color((uint8_t)((*((uint16_t *)(((uint8_t *)(index)) + (sizeof(uint8_t) * 4)))) >> (uint8_t)2));
         Clock;
 
+#if PANEL_X > 16
         ++index;
         _set_color(*(uint8_t *)(index) << (uint8_t)2);
         Clock;
@@ -293,6 +295,7 @@ void _displayBigBuffer()
         _set_color((uint8_t)((*((uint16_t *)(((uint8_t *)(index)) + (sizeof(uint8_t) * 4)))) >> (uint8_t)2));
         Clock;
 
+#endif
 #if PANEL_X > 32
         ++index;
         _set_color(*(uint8_t *)(index) << (uint8_t)2);
diff --git a/src/output/hub75/flash_buffer.h b/src/output/hub75/flash_buffer.h
index b7d2d42..519dee4 100644
--- a/src/output/hub75/flash_buffer.h
+++ b/src/output/hub75/flash_buffer.h
@@ -78,7 +78,7 @@ void _displayFlashBuffer()
         _set_color(pgm_read_byte(INDEX_MOVE));
         Clock;
 
-#if PANEL_X >= 32
+#if PANEL_X > 16
         _set_color(pgm_read_byte(INDEX_MOVE));
         Clock;
         _set_color(pgm_read_byte(INDEX_MOVE));
@@ -113,7 +113,7 @@ void _displayFlashBuffer()
         _set_color(pgm_read_byte(INDEX_MOVE));
         Clock;
 #endif
-#if PANEL_X >= 64
+#if PANEL_X > 32
         _set_color(pgm_read_byte(INDEX_MOVE));
         Clock;
         _set_color(pgm_read_byte(INDEX_MOVE));
@@ -255,7 +255,7 @@ void _displayFlashBuffer()
         _set_color(pgm_read_byte(INDEX_MOVE));
         Clock;
 
-#if PANEL_X >= 32
+#if PANEL_X > 16
         _set_color(pgm_read_byte(INDEX_MOVE));
         Clock;
         _set_color(pgm_read_byte(INDEX_MOVE));
@@ -290,7 +290,7 @@ void _displayFlashBuffer()
         _set_color(pgm_read_byte(INDEX_MOVE));
         Clock;
 #endif
-#if PANEL_X >= 64
+#if PANEL_X > 32
         _set_color(pgm_read_byte(INDEX_MOVE));
         Clock;
         _set_color(pgm_read_byte(INDEX_MOVE));
@@ -431,7 +431,7 @@ void _displayFlashBuffer()
         _set_color(pgm_read_byte(INDEX_MOVE));
         Clock;
 
-#if PANEL_X >= 32
+#if PANEL_X > 16
         _set_color(pgm_read_byte(INDEX_MOVE));
         Clock;
         _set_color(pgm_read_byte(INDEX_MOVE));
@@ -466,7 +466,7 @@ void _displayFlashBuffer()
         _set_color(pgm_read_byte(INDEX_MOVE));
         Clock;
 #endif
-#if PANEL_X >= 64
+#if PANEL_X > 32
         _set_color(pgm_read_byte(INDEX_MOVE));
         Clock;
         _set_color(pgm_read_byte(INDEX_MOVE));
@@ -608,7 +608,7 @@ void _displayFlashBuffer()
         _set_color(pgm_read_byte(INDEX_MOVE));
         Clock;
 
-#if PANEL_X >= 32
+#if PANEL_X > 16
         _set_color(pgm_read_byte(INDEX_MOVE));
         Clock;
         _set_color(pgm_read_byte(INDEX_MOVE));
@@ -643,7 +643,7 @@ void _displayFlashBuffer()
         _set_color(pgm_read_byte(INDEX_MOVE));
         Clock;
 #endif
-#if PANEL_X >= 64
+#if PANEL_X > 32
         _set_color(pgm_read_byte(INDEX_MOVE));
         Clock;
         _set_color(pgm_read_byte(INDEX_MOVE));