diff --git a/src/requests/LocationRequest.ts b/src/requests/LocationRequest.ts
index 48d0e2b..90207d7 100644
--- a/src/requests/LocationRequest.ts
+++ b/src/requests/LocationRequest.ts
@@ -39,7 +39,7 @@ class LocationRequest {
     order?: string;
   }) {
     this.userId = req.userId;
-    this.deviceId = req.deviceId;
+    this.deviceId = req.deviceId?.length ? req.deviceId : this.deviceId;
     this.initNumber('limit', req);
     this.initNumber('offset', req);
     this.initDate('startDate', req);
@@ -85,6 +85,11 @@ class LocationRequest {
       queryMap.offset = this.offset;
     }
 
+    if (this.deviceId != null) {
+      const deviceIds = this.deviceId.split(/\s*,\s*/);
+      where[db.locationTableColumns.deviceId || 'deviceId'] = {[Op.in]: deviceIds};
+    }
+
     const colMapping: any = db.locationTableColumns
     if (this.startDate != null || this.endDate != null) {
       const start = this.startDate == null ? 0 : this.startDate.getTime();