diff --git a/host/Host.cpp b/host/Host.cpp
index d06947c6..23f7721e 100644
--- a/host/Host.cpp
+++ b/host/Host.cpp
@@ -1022,14 +1022,7 @@ int Host::run()
                     else {
                         ret = p25->writeEndRF();
                         if (ret) {
-                            if (m_state == STATE_IDLE) {
-                                m_modeTimer.setTimeout(m_rfModeHang);
-                                setState(STATE_P25);
-                            }
-
-                            if (m_state == STATE_P25) {
-                                m_modeTimer.start();
-                            }
+                            m_modeTimer.start();
                         }
                     }
                 }