diff --git a/interface/src/project/api.ts b/interface/src/project/api.ts
index 72f86d5af..98d65f92f 100644
--- a/interface/src/project/api.ts
+++ b/interface/src/project/api.ts
@@ -19,7 +19,8 @@ import { alovaInstance } from 'api/endpoints';
 export const readCoreData = () => alovaInstance.Get<CoreData>(`/rest/coreData`);
 export const readDeviceData = (id: number) =>
   alovaInstance.Get<DeviceData>('/rest/deviceData', {
-    params: { id },
+    // alovaInstance.Get<DeviceData>(`/rest/deviceData/${id}`, {
+    params: { id }, // TODO remove later
     responseType: 'arraybuffer' // uses msgpack
   });
 export const writeDeviceValue = (data: any) => alovaInstance.Post('/rest/writeDeviceValue', data);
@@ -53,8 +54,9 @@ export const getSchedule = () => alovaInstance.Get('/rest/getSchedule');
 
 // SettingsCustomization
 export const readDeviceEntities = (id: number) =>
-  alovaInstance.Get<DeviceEntity[]>('/rest/deviceEntities', {
-    params: { id },
+  // alovaInstance.Get<DeviceEntity[]>(`/rest/deviceEntities/${id}`, {
+  alovaInstance.Get<DeviceEntity[]>(`/rest/deviceEntities`, {
+    params: { id }, // TODO remove later
     responseType: 'arraybuffer',
     transformData(data: any) {
       return data.map((de: DeviceEntity) => ({ ...de, o_m: de.m, o_cn: de.cn, o_mi: de.mi, o_ma: de.ma }));
diff --git a/mock-api/Handler.ts b/mock-api/Handler.ts
index f42283e6c..fc519a0eb 100644
--- a/mock-api/Handler.ts
+++ b/mock-api/Handler.ts
@@ -419,8 +419,13 @@ const EMSESP_CORE_DATA_ENDPOINT = REST_ENDPOINT_ROOT + 'coreData';
 const EMSESP_SENSOR_DATA_ENDPOINT = REST_ENDPOINT_ROOT + 'sensorData';
 const EMSESP_DEVICES_ENDPOINT = REST_ENDPOINT_ROOT + 'devices';
 const EMSESP_SCANDEVICES_ENDPOINT = REST_ENDPOINT_ROOT + 'scanDevices';
-const EMSESP_DEVICEDATA_ENDPOINT = REST_ENDPOINT_ROOT + 'deviceData/:id';
-const EMSESP_DEVICEENTITIES_ENDPOINT = REST_ENDPOINT_ROOT + 'deviceEntities/:id';
+
+// const EMSESP_DEVICEDATA_ENDPOINT = REST_ENDPOINT_ROOT + 'deviceData/:id';
+// const EMSESP_DEVICEENTITIES_ENDPOINT = REST_ENDPOINT_ROOT + 'deviceEntities/:id';
+
+const EMSESP_DEVICEDATA_ENDPOINT = REST_ENDPOINT_ROOT + 'deviceData';
+const EMSESP_DEVICEENTITIES_ENDPOINT = REST_ENDPOINT_ROOT + 'deviceEntities';
+
 const EMSESP_STATUS_ENDPOINT = REST_ENDPOINT_ROOT + 'status';
 const EMSESP_BOARDPROFILE_ENDPOINT = REST_ENDPOINT_ROOT + 'boardProfile';
 const EMSESP_WRITE_VALUE_ENDPOINT = REST_ENDPOINT_ROOT + 'writeDeviceValue';
@@ -2466,7 +2471,9 @@ router
   .post(EMSESP_SCANDEVICES_ENDPOINT, () => new Response('OK', { status: 200 }))
   .get(EMSESP_STATUS_ENDPOINT, () => new Response(JSON.stringify(status), { headers }))
   .get(EMSESP_DEVICEDATA_ENDPOINT, (request) => {
-    const id = Number(request.params.id);
+    // const id = Number(request.params.id); // TODO when using :id
+    const id = Number(request.query.id);
+
     if (id == 1) {
       return new Response(encoder.encode(emsesp_devicedata_1), { headers });
     }
@@ -2493,7 +2500,9 @@ router
     }
   })
   .get(EMSESP_DEVICEENTITIES_ENDPOINT, (request) => {
-    const id = Number(request.params.id);
+    // const id = Number(request.params.id); // TODO when using :id
+    const id = Number(request.query.id);
+
     if (id == 1) {
       return new Response(encoder.encode(emsesp_deviceentities_1), { headers });
     }