diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index e43606e332..865365c0ee 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -676,12 +676,6 @@
 #endif
 
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
-  #if ANY(FIL_RUNOUT1_STATE, FIL_RUNOUT1_PULL, FIL_RUNOUT2_STATE, FIL_RUNOUT2_PULL, \
-          FIL_RUNOUT3_STATE, FIL_RUNOUT3_PULL, FIL_RUNOUT4_STATE, FIL_RUNOUT4_PULL, \
-          FIL_RUNOUT5_STATE, FIL_RUNOUT5_PULL, FIL_RUNOUT6_STATE, FIL_RUNOUT6_PULL, \
-          FIL_RUNOUT7_STATE, FIL_RUNOUT7_PULL, FIL_RUNOUT8_STATE, FIL_RUNOUT8_PULL  )
-    #define DISTINCT_FIL_RUNOUT_STATES 1
-  #endif
   #if NUM_RUNOUT_SENSORS >= 1
     #ifndef FIL_RUNOUT1_STATE
       #define FIL_RUNOUT1_STATE FIL_RUNOUT_STATE
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 2d8adc2bae..cbc3ab2ffe 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -461,27 +461,17 @@ void _O2 Endstops::report_states() {
     #if NUM_RUNOUT_SENSORS == 1
       print_es_state(READ(FIL_RUNOUT_PIN) != FIL_RUNOUT_STATE, PSTR(STR_FILAMENT_RUNOUT_SENSOR));
     #else
-      #if ENABLED(DISTINCT_FIL_RUNOUT_STATES)
-        #define _CASE_RUNOUT(N) case N: pin = FIL_RUNOUT##N##_PIN; state = FIL_RUNOUT##N##_STATE; break;
-      #else
-        #define _CASE_RUNOUT(N) case N: pin = FIL_RUNOUT##N##_PIN; break;
-      #endif
+      #define _CASE_RUNOUT(N) case N: pin = FIL_RUNOUT##N##_PIN; state = FIL_RUNOUT##N##_STATE; break;
       LOOP_S_LE_N(i, 1, NUM_RUNOUT_SENSORS) {
         pin_t pin;
-        #if ENABLED(DISTINCT_FIL_RUNOUT_STATES)
-          uint8_t state;
-        #endif
+        uint8_t state;
         switch (i) {
           default: continue;
           REPEAT_S(1, INCREMENT(NUM_RUNOUT_SENSORS), _CASE_RUNOUT)
         }
         SERIAL_ECHOPGM(STR_FILAMENT_RUNOUT_SENSOR);
         if (i > 1) SERIAL_CHAR(' ', '0' + i);
-        #if ENABLED(DISTINCT_FIL_RUNOUT_STATES)
-          print_es_state(extDigitalRead(pin) != state);
-        #else
-          print_es_state(extDigitalRead(pin) != FIL_RUNOUT_STATE);
-        #endif
+        print_es_state(extDigitalRead(pin) != state);
       }
       #undef _CASE_RUNOUT
     #endif