diff --git a/weboob/ouiboube.py b/weboob/ouiboube.py
index 9175da29..434371c4 100644
--- a/weboob/ouiboube.py
+++ b/weboob/ouiboube.py
@@ -96,5 +96,8 @@ class Weboob:
     def repeat(self, interval, function, *args):
         return self.scheduler.repeat(interval, function, *args)
 
+    def want_stop(self):
+        return self.scheduler.want_stop()
+
     def loop(self):
         return self.scheduler.run()
diff --git a/weboob/scheduler.py b/weboob/scheduler.py
index d84560e3..c8c4c7b8 100644
--- a/weboob/scheduler.py
+++ b/weboob/scheduler.py
@@ -36,6 +36,8 @@ class Scheduler(object):
         self.running = True
         while self.running:
             self.scheduler.run()
+            if not self.scheduler.queue:
+                self.scheduler.delayfunc(0.001)
         return True
 
     def want_stop(self):