diff --git a/bacnet-stack/demo/gateway/main.c b/bacnet-stack/demo/gateway/main.c
index b48628f1..689d109d 100644
--- a/bacnet-stack/demo/gateway/main.c
+++ b/bacnet-stack/demo/gateway/main.c
@@ -330,9 +330,9 @@ int main(
             dlenv_maintenance_timer(elapsed_seconds);
             Load_Control_State_Machine_Handler();
             elapsed_milliseconds = elapsed_seconds * 1000;
-            handler_cov_task();
             tsm_timer_milliseconds(elapsed_milliseconds);
         }
+        handler_cov_task();
         /* output */
 
         /* blink LEDs, Turn on or off outputs, etc */