diff --git a/Marlin/src/pins/mega/pins_HJC2560C_REV2.h b/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
index 38e6617f51..4b454f2968 100644
--- a/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
+++ b/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * Geeetech HJC2560-C Rev 2.x board pin assignments
+ * Geeetech HJC2560-C Rev 1.x and 2.x board pin assignments
  * ATmega2560
  */
 
@@ -78,6 +78,13 @@
 #endif
 #define DEFAULT_PWM_MOTOR_CURRENT  { 1300, 1300, 1250 }
 
+//
+// Filament Runout Sensor
+//
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN                      24  // Filament runout
+#endif
+
 //
 // Temperature Sensors
 //
@@ -138,9 +145,6 @@
       //#ifndef LCD_CONTRAST_PIN
       //  #define LCD_CONTRAST_PIN             5  // LCD_Contrast
       //#endif
-      #ifndef FIL_RUNOUT_PIN
-        #define FIL_RUNOUT_PIN                24  // Filament runout
-      #endif
     #else
       #define LCD_PINS_D5                     21
       #define LCD_PINS_D6                      5
diff --git a/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h b/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
index 448c79a8d2..4633bfc037 100644
--- a/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
+++ b/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
@@ -89,6 +89,16 @@
 #endif
 #define DEFAULT_PWM_MOTOR_CURRENT  {1300, 1300, 1250}
 
+//
+// Filament Runout Sensor
+//
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN                      54  // ADC0
+#endif
+#ifndef FIL_RUNOUT2_PIN
+  #define FIL_RUNOUT2_PIN                     55  // ADC1
+#endif
+
 //
 // Temperature Sensors
 //