diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp
index 2cfafbc..1ef0934 100644
--- a/src/driver/rcinput.cpp
+++ b/src/driver/rcinput.cpp
@@ -539,8 +539,9 @@ int CRCInput::checkTimers()
        return _id;
 }

-int64_t CRCInput::calcTimeoutEnd(const int timeout_in_seconds)
+int64_t CRCInput::calcTimeoutEnd(const int _timeout_in_seconds)
 {
+       int timeout_in_seconds = (_timeout_in_seconds == 0) ? 0xFFFF : _timeout_in_seconds;
        return time_monotonic_us() + ((uint64_t)timeout_in_seconds * (uint64_t) 1000000);
 }