diff --git a/components/StreamServer/StreamServer/StreamServer.cpp b/components/StreamServer/StreamServer/StreamServer.cpp
index acaec73..42fcfa4 100644
--- a/components/StreamServer/StreamServer/StreamServer.cpp
+++ b/components/StreamServer/StreamServer/StreamServer.cpp
@@ -38,9 +38,8 @@ esp_err_t StreamHelpers::stream(httpd_req_t *req)
   httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
   httpd_resp_set_hdr(req, "X-Framerate", "60");
 
-  if (SendStreamEvent(eventQueue, StreamState_e::Stream_ON)) {
+  if (SendStreamEvent(eventQueue, StreamState_e::Stream_ON))
     stream_on_sent = true;
-  }
 
   while (true)
   {
@@ -96,9 +95,8 @@ esp_err_t StreamHelpers::stream(httpd_req_t *req)
   }
   last_frame = 0;
 
-  if (stream_on_sent) {
+  if (stream_on_sent)
     SendStreamEvent(eventQueue, StreamState_e::Stream_OFF);
-  }
 
   return response;
 }
@@ -152,6 +150,10 @@ esp_err_t StreamServer::startStreamServer()
 
   httpd_register_uri_handler(camera_stream, &stream_page);
 
+  // Initial state is OFF
+  if (this->stateManager)
+    SendStreamEvent(this->stateManager->GetEventQueue(), StreamState_e::Stream_OFF);
+
   ESP_LOGI(STREAM_SERVER_TAG, "Stream server started on port %d", STREAM_SERVER_PORT);
 
   return ESP_OK;
diff --git a/components/UVCStream/UVCStream/UVCStream.cpp b/components/UVCStream/UVCStream/UVCStream.cpp
index 324beed..2967057 100644
--- a/components/UVCStream/UVCStream/UVCStream.cpp
+++ b/components/UVCStream/UVCStream/UVCStream.cpp
@@ -203,6 +203,9 @@ esp_err_t UVCStreamManager::setup()
   }
   ESP_LOGI(UVC_STREAM_TAG, "Initialized UVC Device");
 
+  // Initial state is OFF
+  SendStreamEvent(eventQueue, StreamState_e::Stream_OFF);
+
   return ESP_OK;
 }