diff --git a/src/input/mpegts/mpegts_mux.c b/src/input/mpegts/mpegts_mux.c
index dff577bd..47212e7a 100644
--- a/src/input/mpegts/mpegts_mux.c
+++ b/src/input/mpegts/mpegts_mux.c
@@ -279,6 +279,7 @@ mpegts_mux_stop ( mpegts_mux_t *mm )
     mpegts_network_t *mn = mm->mm_network;
     TAILQ_REMOVE(&mn->mn_initial_scan_current_queue, mm, mm_initial_scan_link);
     mm->mm_initial_scan_status = MM_SCAN_PENDING;
+    gtimer_disarm(&mm->mm_initial_scan_timeout);
     TAILQ_INSERT_TAIL(&mn->mn_initial_scan_pending_queue, mm, mm_initial_scan_link);
     mpegts_network_schedule_initial_scan(mn);
   }