diff --git a/Firmware/SpoolJoin.cpp b/Firmware/SpoolJoin.cpp
index e22595d15d..dfb6b7bf87 100644
--- a/Firmware/SpoolJoin.cpp
+++ b/Firmware/SpoolJoin.cpp
@@ -55,7 +55,7 @@ uint8_t SpoolJoin::nextSlot()
     SERIAL_ECHOPGM("SpoolJoin: ");
     SERIAL_ECHO((int)currentMMUSlot);
 
-    if (currentMMUSlot >= 4) currentMMUSlot = 0;
+    if (currentMMUSlot >= MMU_FILAMENT_COUNT-1) currentMMUSlot = 0;
     else currentMMUSlot++;
 
     SERIAL_ECHOPGM(" -> ");
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index f9a2b4fcce..b3bc39d1b6 100644
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4735,7 +4735,7 @@ static void lcd_disable_farm_mode()
 }
 
 static inline void load_all_wrapper(){
-    for(uint8_t i = 0; i < 5; ++i){
+    for(uint8_t i = 0; i < MMU_FILAMENT_COUNT; ++i){
         MMU2::mmu2.load_filament(i);
     }
 }
@@ -4812,7 +4812,7 @@ static void mmu_cut_filament_menu() {
 #endif //MMU_HAS_CUTTER
 
 static inline void loading_test_all_wrapper(){
-    for(uint8_t i = 0; i < 5; ++i){
+    for(uint8_t i = 0; i < MMU_FILAMENT_COUNT; ++i){
         MMU2::mmu2.loading_test(i);
     }