diff --git a/interactions.py b/interactions.py
index 3ba56208..d2792296 100644
--- a/interactions.py
+++ b/interactions.py
@@ -59,6 +59,9 @@ class Interactions(FileSystemEventHandler):
             self.observer = Observer()
             self.observer.daemon = True
             self.observer.start()
+        elif polling and self.observer:
+            self.observer.stop()
+            self.observer = None
 
         if not self.observed and not polling:
             self.observed = self.observer.schedule(self, self.currentdir)
diff --git a/monitor.py b/monitor.py
index b9232200..c27601f3 100644
--- a/monitor.py
+++ b/monitor.py
@@ -179,6 +179,9 @@ class EDLogs(FileSystemEventHandler):
             self.observer = Observer()
             self.observer.daemon = True
             self.observer.start()
+        elif polling and self.observer:
+            self.observer.stop()
+            self.observer = None
 
         if not self.observed and not polling:
             self.observed = self.observer.schedule(self, self.currentdir)