diff --git a/src/scene/services/scene.service.ts b/src/scene/services/scene.service.ts
index 4083067..b45caf8 100644
--- a/src/scene/services/scene.service.ts
+++ b/src/scene/services/scene.service.ts
@@ -241,12 +241,30 @@ export class SceneService {
         throw new HttpException(response.msg, HttpStatus.BAD_REQUEST);
       }
       const responseData = convertKeysToCamelCase(response.result);
+      const actions = responseData.actions.map((action) => {
+        return {
+          ...action,
+        };
+      });
+
+      for (const action of actions) {
+        if (action.actionExecutor === 'device_issue') {
+          const device = await this.deviceService.getDeviceByDeviceTuyaUuid(
+            action.entityId,
+          );
+
+          if (device) {
+            action.entityId = device.uuid;
+          }
+        }
+      }
+
       return {
         id: responseData.id,
         name: responseData.name,
         status: responseData.status,
         type: 'tap_to_run',
-        actions: responseData.actions,
+        actions: actions,
         ...(withSpaceId && { spaceId: responseData.spaceId }),
       };
     } catch (err) {