diff --git a/components/UVCStream/UVCStream/UVCStream.cpp b/components/UVCStream/UVCStream/UVCStream.cpp
index 5a55416..324beed 100644
--- a/components/UVCStream/UVCStream/UVCStream.cpp
+++ b/components/UVCStream/UVCStream/UVCStream.cpp
@@ -67,8 +67,7 @@ static esp_err_t UVCStreamHelpers::camera_start_cb(uvc_format_t format, int widt
 
   cameraHandler->setCameraResolution(frame_size);
 
-  constexpr SystemEvent event = {EventSource::STREAM, StreamState_e::Stream_ON};
-  xQueueSend(eventQueue, &event, 10);
+  SendStreamEvent(eventQueue, StreamState_e::Stream_ON);
 
   return ESP_OK;
 }
@@ -82,8 +81,7 @@ static void UVCStreamHelpers::camera_stop_cb(void *cb_ctx)
     s_fb.cam_fb_p = nullptr;
   }
 
-  constexpr SystemEvent event = {EventSource::STREAM, StreamState_e::Stream_OFF};
-  xQueueSend(eventQueue, &event, 10);
+  SendStreamEvent(eventQueue, StreamState_e::Stream_OFF);
 }
 
 static uvc_fb_t *UVCStreamHelpers::camera_fb_get_cb(void *cb_ctx)