diff --git a/app/api/RoomsApi.php b/app/api/RoomsApi.php
index d3a5dc9..b4c27a4 100644
--- a/app/api/RoomsApi.php
+++ b/app/api/RoomsApi.php
@@ -15,12 +15,13 @@ class RoomsApi extends ApiController{
 		$subDevicesData = SubDeviceManager::getSubdevicesByRoomIds($roomIds);
 
 		foreach ($roomsData as $roomKey => $roomData) {
-			if ($roomData['device_count'] <= 0) continue;
-			$response[] = [
-				'room_id' => $roomData['room_id'],
-				'name' => $roomData['name'],
-				'widgets' => isset($subDevicesData[$roomData['room_id']]) ? $subDevicesData[$roomData['room_id']] : [],
-			];
+			if ($roomData['device_count'] != 0){
+				$response[] = [
+					'room_id' => $roomData['room_id'],
+					'name' => $roomData['name'],
+					'widgets' => isset($subDevicesData[$roomData['room_id']]) ? $subDevicesData[$roomData['room_id']] : [],
+				];
+			}
 		}
 		$this->response($response);
 	}
diff --git a/app/models/managers/RoomManager.php b/app/models/managers/RoomManager.php
index 6c7f393..b747393 100644
--- a/app/models/managers/RoomManager.php
+++ b/app/models/managers/RoomManager.php
@@ -8,11 +8,13 @@ class RoomManager{
 	}
 
 	static function getAllRooms () {
+		//TODO: ignore Widgets withoud data
 		$allRoom = Db::loadAll ("SELECT rooms.*, COUNT(devices.device_id) as device_count FROM rooms LEFT JOIN devices ON (devices.room_id=rooms.room_id) GROUP BY rooms.room_id");
 		return $allRoom;
 	}
 
 	static function getRoomsDefault () {
+		//TODO: ignore Widgets withoud data
 		$allRoom = Db::loadAll ("SELECT rooms.room_id, rooms.name, COUNT(devices.device_id) as device_count FROM rooms LEFT JOIN devices ON (devices.room_id=rooms.room_id) GROUP BY rooms.room_id;");
 		return $allRoom;
 	}