diff --git a/components/UVCStream/UVCStream/UVCStream.cpp b/components/UVCStream/UVCStream/UVCStream.cpp
index 07f61c3..e33b839 100644
--- a/components/UVCStream/UVCStream/UVCStream.cpp
+++ b/components/UVCStream/UVCStream/UVCStream.cpp
@@ -111,7 +111,7 @@ esp_err_t UVCStreamManager::setup()
 
 #ifndef CONFIG_GENERAL_WIRED_MODE
   ESP_LOGE(UVC_STREAM_TAG, "The board does not support UVC, please, setup WiFi connection.");
-  return;
+  return ESP_FAIL;
 #endif
 
   ESP_LOGI(UVC_STREAM_TAG, "Setting up UVC Stream");
diff --git a/main/openiris_main.cpp b/main/openiris_main.cpp
index d4f06ec..4d2be06 100644
--- a/main/openiris_main.cpp
+++ b/main/openiris_main.cpp
@@ -90,13 +90,21 @@ void start_video_streaming(void *arg) {
                 ESP_LOGI("[MAIN]", "WiFi setup detected, starting WiFi streaming.");
                 streamServer.startStreamServer();
             } else {
+            #ifdef CONFIG_GENERAL_WIRED_MODE
                 ESP_LOGI("[MAIN]", "UVC setup detected, starting UVC streaming.");
                 uvcStream.setup();
+            #else
+                ESP_LOGW("[MAIN]", "UVC streaming not supported in this configuration.");
+            #endif
             }
             break;
         case StreamingMode::UVC:
+        #ifdef CONFIG_GENERAL_WIRED_MODE
             ESP_LOGI("[MAIN]", "Device set to UVC Mode, starting UVC streaming.");
             uvcStream.setup();
+        #else
+            ESP_LOGW("[MAIN]", "UVC streaming not supported in this configuration.");
+        #endif
             break;
         case StreamingMode::WIFI:
             ESP_LOGI("[MAIN]", "Device set to Wi-Fi mode, starting WiFi streaming.");
diff --git a/sdkconfig.board.facefocusvr_eye b/sdkconfig.board.facefocusvr_eye
index d8918fa..e05fc60 100644
--- a/sdkconfig.board.facefocusvr_eye
+++ b/sdkconfig.board.facefocusvr_eye
@@ -58,4 +58,5 @@ CONFIG_LED_EXTERNAL_CONTROL=y
 CONFIG_LED_EXTERNAL_GPIO=9
 CONFIG_LED_EXTERNAL_PWM_FREQ=20000
 CONFIG_LED_EXTERNAL_PWM_DUTY_CYCLE=50
-CONFIG_Camera_USB_XCLK_FREQ=23000000
\ No newline at end of file
+CONFIG_Camera_USB_XCLK_FREQ=23000000
+CONFIG_GENERAL_WIRED_MODE=y
\ No newline at end of file
diff --git a/sdkconfig.board.facefocusvr_face b/sdkconfig.board.facefocusvr_face
index 5ae7e16..64ced36 100644
--- a/sdkconfig.board.facefocusvr_face
+++ b/sdkconfig.board.facefocusvr_face
@@ -58,4 +58,5 @@ CONFIG_LED_EXTERNAL_CONTROL=y
 CONFIG_LED_EXTERNAL_GPIO=9
 CONFIG_LED_EXTERNAL_PWM_FREQ=20000
 CONFIG_LED_EXTERNAL_PWM_DUTY_CYCLE=100
-CONFIG_Camera_USB_XCLK_FREQ=23000000
\ No newline at end of file
+CONFIG_Camera_USB_XCLK_FREQ=23000000
+CONFIG_GENERAL_WIRED_MODE=y
\ No newline at end of file
diff --git a/sdkconfig.board.project_babble b/sdkconfig.board.project_babble
index 301a6e5..cab3591 100644
--- a/sdkconfig.board.project_babble
+++ b/sdkconfig.board.project_babble
@@ -50,4 +50,5 @@ CONFIG_LED_EXTERNAL_CONTROL=y
 CONFIG_LED_EXTERNAL_PWM_FREQ=5000
 CONFIG_LED_EXTERNAL_PWM_DUTY_CYCLE=100
 CONFIG_LED_EXTERNAL_GPIO=1
-CONFIG_Camera_USB_XCLK_FREQ=23000000 # NOT TESTED
\ No newline at end of file
+CONFIG_Camera_USB_XCLK_FREQ=23000000 # NOT TESTED
+CONFIG_GENERAL_WIRED_MODE=y
\ No newline at end of file