diff --git a/src/library/filescanner.c b/src/library/filescanner.c
index 108df7dc..b60229e5 100644
--- a/src/library/filescanner.c
+++ b/src/library/filescanner.c
@@ -1612,6 +1612,11 @@ filescanner_rescan()
   inofd_event_set();
   bulk_scan(F_SCAN_BULK | F_SCAN_RESCAN);
 
+  if (!library_is_exiting())
+    {
+      /* Enable inotify */
+      event_add(inoev, NULL);
+    }
   return 0;
 }
 
@@ -1624,6 +1629,11 @@ filescanner_fullrescan()
   inofd_event_set();
   bulk_scan(F_SCAN_BULK);
 
+  if (!library_is_exiting())
+    {
+      /* Enable inotify */
+      event_add(inoev, NULL);
+    }
   return 0;
 }