diff --git a/python_apps/media-monitor/MediaMonitor.py b/python_apps/media-monitor/MediaMonitor.py
index 2e1cd4686..d9ca1aa90 100644
--- a/python_apps/media-monitor/MediaMonitor.py
+++ b/python_apps/media-monitor/MediaMonitor.py
@@ -238,10 +238,17 @@ class AirtimeNotifier(Notifier):
             new_storage_directory = m['directory'].encode('utf-8')
 
             mm = self.proc_fun()
+
+            wd = mm.wm.get_wd(storage_directory)
+            self.logger.info("Removing watch on: %s wd %s", storage_directory, wd)
+            mm.wm.rm_watch(wd, rec=True)
+
             mm.set_needed_file_permissions(new_storage_directory, True)
             mm.move_file(storage_directory, new_storage_directory)
             storage_directory = new_storage_directory
 
+            mm.watch_directory(new_storage_directory)
+
 
     def update_airtime(self, d):