diff --git a/Backend/Controllers/DeviceManageController.cs b/Backend/Controllers/DeviceManageController.cs
index da1b5f6..c2ddf85 100644
--- a/Backend/Controllers/DeviceManageController.cs
+++ b/Backend/Controllers/DeviceManageController.cs
@@ -212,7 +212,7 @@ namespace Backend.Controllers
                             JOIN building b ON d.device_building_tag = b.building_tag
                             JOIN variable mv ON d.device_system_tag = mv.system_value AND mv.system_type = @main_system_type and mv.deleted = 0
                             JOIN variable sv ON d.device_name_tag = sv.system_value AND sv.system_type = @sub_system_type and sv.deleted = 0
-                            JOIN floor f ON d.device_floor_tag = f.full_name  AND d.device_building_tag = f.building_tag
+                            JOIN floor f ON d.device_floor_tag = f.full_name  AND d.device_building_tag = f.building_tag and f.deleted = 0
                             LEFT JOIN device_kind dk ON dk.device_building_tag = d.device_building_tag AND dk.device_system_tag = d.device_system_tag AND dk.device_name_tag = d.device_name_tag
                             ORDER BY d.priority ASC, d.device_number ASC";