diff --git a/src/usb_moded-udev.c b/src/usb_moded-udev.c
index 62c49c5..7f7fae1 100644
--- a/src/usb_moded-udev.c
+++ b/src/usb_moded-udev.c
@@ -264,8 +264,9 @@ static gboolean monitor_udev(GIOChannel *iochannel G_GNUC_UNUSED, GIOCondition c
 
   release_wakelock(USB_MODED_WAKELOCK_PROCESS_INPUT);
 
-  if (!continue_watching)
+  if (!continue_watching && watch_id )
   {
+    watch_id = 0;
     log_crit("udev io watch disabled");
   }