diff --git a/platypush/plugins/camera/pi.py b/platypush/plugins/camera/pi.py
index 773e57496b..4c8c68a6a6 100644
--- a/platypush/plugins/camera/pi.py
+++ b/platypush/plugins/camera/pi.py
@@ -449,7 +449,8 @@ class CameraPiPlugin(CameraPlugin):
                     try:
                         if stream:
                             camera.start_recording(stream, format=format)
-                            camera.wait_recording()
+                            while True:
+                                camera.wait_recording(1)
                     except ConnectionError:
                         self.logger.info('Client closed connection')
                     finally: