diff --git a/src/services/device-management/application.service.ts b/src/services/device-management/application.service.ts
index 55c00a65..49d9a482 100644
--- a/src/services/device-management/application.service.ts
+++ b/src/services/device-management/application.service.ts
@@ -171,8 +171,11 @@ export class ApplicationService {
       .leftJoinAndSelect("app.belongsTo", "organization")
       .leftJoinAndSelect("device.latestReceivedMessage", "latestMessage")
       .leftJoinAndSelect("app.dataTargets", "dataTargets")
-      .leftJoinAndSelect("app.controlledProperties", "controlledProperties")
-      .andWhere("app.belongsToId = :organizationId", { organizationId: query.organizationId });
+      .leftJoinAndSelect("app.controlledProperties", "controlledProperties");
+
+    if (query.organizationId) {
+      queryBuilder.andWhere("app.belongsToId = :organizationId", { organizationId: query.organizationId });
+    }
 
     if (whitelist && whitelist.length > 0) {
       queryBuilder.andWhere("app.id IN (:...whitelist)", { whitelist });