diff --git a/components/UVCStream/UVCStream/UVCStream.cpp b/components/UVCStream/UVCStream/UVCStream.cpp
index 0021858..2af52b6 100644
--- a/components/UVCStream/UVCStream/UVCStream.cpp
+++ b/components/UVCStream/UVCStream/UVCStream.cpp
@@ -28,8 +28,8 @@ static esp_err_t UVCStreamHelpers::camera_start_cb(uvc_format_t format, int widt
     return ESP_ERR_NOT_SUPPORTED;
   }
 
-  cameraHandler.setCameraResolution(frame_size);
-  cameraHandler.resetCamera(0);
+  cameraHandler->setCameraResolution(frame_size);
+  cameraHandler->resetCamera(0);
 
   return ESP_OK;
 }
diff --git a/components/UVCStream/UVCStream/UVCStream.hpp b/components/UVCStream/UVCStream/UVCStream.hpp
index 38675ee..187b501 100644
--- a/components/UVCStream/UVCStream/UVCStream.hpp
+++ b/components/UVCStream/UVCStream/UVCStream.hpp
@@ -9,7 +9,7 @@
 
 // we need access to the camera manager
 // in order to update the frame settings
-extern CameraManager cameraHandler;
+extern std::shared_ptr<CameraManager> cameraHandler;
 
 namespace UVCStreamHelpers
 {
diff --git a/main/openiris_main.cpp b/main/openiris_main.cpp
index 3f969fe..22e7fe9 100644
--- a/main/openiris_main.cpp
+++ b/main/openiris_main.cpp
@@ -36,7 +36,7 @@ Preferences preferences;
 auto deviceConfig = std::make_shared<ProjectConfig>(&preferences);
 WiFiManager wifiManager(deviceConfig);
 MDNSManager mdnsManager(deviceConfig);
-auto cameraHandler = std::make_shared<CameraManager>(deviceConfig);
+std::shared_ptr<CameraManager> cameraHandler = std::make_shared<CameraManager>(deviceConfig);
 StreamServer streamServer(80);
 
 auto commandManager = std::make_shared<CommandManager>(deviceConfig, cameraHandler);