diff --git a/sopel/bot.py b/sopel/bot.py
index edb0040452..b0d13331cc 100644
--- a/sopel/bot.py
+++ b/sopel/bot.py
@@ -162,7 +162,9 @@ def unregister(self, obj):
             for rule in obj.rule:
                 self._callables[obj.priority][rule].remove(obj)
         if hasattr(obj, 'interval'):
-            pass  # TODO
+            # TODO this should somehow find the right job to remove, rather than
+            # clearing the entire queue. Issue #831
+            self.scheduler.clear_jobs()
         if getattr(obj, '__name__', None) == 'shutdown':
             self.shutdown_methods.remove(obj)