diff --git a/usermods/Animated_Staircase/Animated_Staircase.cpp b/usermods/Animated_Staircase/Animated_Staircase.cpp
index 2d2d27cf43..e477c64d8c 100644
--- a/usermods/Animated_Staircase/Animated_Staircase.cpp
+++ b/usermods/Animated_Staircase/Animated_Staircase.cpp
@@ -153,7 +153,8 @@ class Animated_Staircase : public Usermod {
       digitalWrite(signalPin, HIGH);
       delayMicroseconds(10);
       digitalWrite(signalPin, LOW);
-      return pulseIn(echoPin, HIGH, maxTimeUs) > 0;
+      unsigned long duration = pulseIn(echoPin, HIGH, 30000);
+      return (duration > 0 && duration < maxTimeUs);
     }
 
     bool checkSensors() {
@@ -564,4 +565,4 @@ const char Animated_Staircase::_togglePower[]               PROGMEM = "toggle-on
 
 
 static Animated_Staircase animated_staircase;
-REGISTER_USERMOD(animated_staircase);
\ No newline at end of file
+REGISTER_USERMOD(animated_staircase);