diff --git a/lib/towerops_web/controllers/api/v1/devices_controller.ex b/lib/towerops_web/controllers/api/v1/devices_controller.ex
index 76938727..6b456e86 100644
--- a/lib/towerops_web/controllers/api/v1/devices_controller.ex
+++ b/lib/towerops_web/controllers/api/v1/devices_controller.ex
@@ -88,12 +88,12 @@ defmodule ToweropsWeb.Api.V1.DevicesController do
     organization_id = conn.assigns.current_organization_id
     current_user = conn.assigns[:current_user]
 
-    # Add organization_id to params if not provided
+    # Default organization_id to authenticated org if not provided or empty
     device_params =
-      if Map.has_key?(device_params, "organization_id") do
-        device_params
-      else
-        Map.put(device_params, "organization_id", organization_id)
+      case Map.get(device_params, "organization_id") do
+        nil -> Map.put(device_params, "organization_id", organization_id)
+        "" -> Map.put(device_params, "organization_id", organization_id)
+        _provided_id -> device_params
       end
 
     # Verify site belongs to organization if site_id is provided