diff --git a/platypush/backend/http/app/routes/plugins/camera/pi.py b/platypush/backend/http/app/routes/plugins/camera/pi.py
index 719c1cb7..25f09e40 100644
--- a/platypush/backend/http/app/routes/plugins/camera/pi.py
+++ b/platypush/backend/http/app/routes/plugins/camera/pi.py
@@ -10,50 +10,36 @@ from platypush.config import Config
 from platypush.plugins.camera.pi import CameraPiPlugin
 
 camera_pi = Blueprint('camera.pi', __name__, template_folder=template_folder)
-filename = os.path.join(tempfile.gettempdir(), 'camera_pi.jpg')
 
 # Declare routes list
 __routes__ = [
     camera_pi,
 ]
 
-_camera: Optional[CameraPiPlugin] = None
-
-
-def get_camera() -> CameraPiPlugin:
-    global _camera
-
-    # noinspection PyProtectedMember
-    if _camera and _camera._camera and not _camera._camera.closed:
-        return _camera
-
-    camera_conf = Config.get('camera.pi') or {}
-    _camera = CameraPiPlugin(**camera_conf)
-    return _camera
-
-
-def get_frame():
-    camera = get_camera()
-    output = camera.get_output_stream()
-
-    with output.ready:
-        output.ready.wait()
-        return output.frame
-
 
 def video_feed():
+    camera: Optional[CameraPiPlugin] = None
+
     try:
+        camera_conf = Config.get('camera.pi') or {}
+        camera = CameraPiPlugin(**camera_conf)
+
         while True:
-            frame = get_frame()
+            output = camera.get_output_stream()
+            with output.ready:
+                output.ready.wait()
+
             yield (b'--frame\r\n'
-                   b'Content-Type: image/jpeg\r\n\r\n' + frame + b'\r\n')
+                   b'Content-Type: image/jpeg\r\n\r\n' + output.frame + b'\r\n')
     finally:
-        send_request(action='camera.pi.close')
+        if camera:
+            camera.close_output_stream()
 
 
 @camera_pi.route('/camera/pi/frame', methods=['GET'])
 @authenticate()
 def get_frame_img():
+    filename = os.path.join(tempfile.gettempdir(), 'camera_pi.jpg')
     response = send_request('camera.pi.take_picture', image_file=filename)
     frame_file = (response.output or {}).get('image_file')
     assert frame_file is not None
@@ -65,16 +51,9 @@ def get_frame_img():
 @camera_pi.route('/camera/pi/stream', methods=['GET'])
 @authenticate()
 def get_stream_feed():
-    global _camera
-
-    try:
-        return Response(video_feed(),
-                        headers={'Cache-Control': 'no-cache, private', 'Pragma': 'no-cache', 'Age': 0},
-                        mimetype='multipart/x-mixed-replace; boundary=frame')
-    finally:
-        if _camera:
-            _camera.close_output_stream()
-            _camera = None
+    return Response(video_feed(),
+                    headers={'Cache-Control': 'no-cache, private', 'Pragma': 'no-cache', 'Age': 0},
+                    mimetype='multipart/x-mixed-replace; boundary=frame')
 
 
 # vim:sw=4:ts=4:et:
diff --git a/platypush/plugins/camera/pi.py b/platypush/plugins/camera/pi.py
index b2410fac..dca463fd 100644
--- a/platypush/plugins/camera/pi.py
+++ b/platypush/plugins/camera/pi.py
@@ -67,7 +67,7 @@ class CameraPiPlugin(CameraPlugin):
         self._time_lapse_stop_condition = threading.Condition()
         self._recording_stop_condition = threading.Condition()
         self._streaming_stop_condition = threading.Condition()
-        self._output: StreamingOutput = None
+        self._output: Optional[StreamingOutput] = None
 
     # noinspection PyUnresolvedReferences,PyPackageRequirements
     def _get_camera(self, **opts):
@@ -175,11 +175,10 @@ class CameraPiPlugin(CameraPlugin):
                 self.close()
 
     def get_output_stream(self, resize: Union[tuple, list] = None, **opts) -> StreamingOutput:
-        camera = self._get_camera(**opts)
-
-        if self._output and not camera.closed:
+        if self._output:
             return self._output
 
+        camera = self._get_camera(**opts)
         capture_opts = {}
         if resize:
             capture_opts['resize'] = tuple(resize)
@@ -189,9 +188,8 @@ class CameraPiPlugin(CameraPlugin):
         return self._output
 
     def close_output_stream(self):
-        if self._camera and not self._camera.closed:
+        if self._output:
             self._camera.stop_recording()
-
         self._output = None
 
     @action