diff --git a/custom_components/tuya_local/devices/moes_rfir_remote.yaml b/custom_components/tuya_local/devices/moes_rfir_remote.yaml
deleted file mode 100644
index 61217c48fb..0000000000
--- a/custom_components/tuya_local/devices/moes_rfir_remote.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Remote controller
-products:
-  - id: wbaloeb3kiwwhads
-    name: Moes RF/IR remote
-  - id: 0gawnyfgyneswent
-    name: IR Controller Pro
-primary_entity:
-  entity: remote
-  dps:
-    - id: 201
-      name: send
-      type: string
-      optional: true
-    - id: 202
-      name: receive
-      type: string
-      optional: true
-      persist: false
-    - id: 1
-      type: string
-      name: scene_1
-    - id: 2
-      type: string
-      optional: true
-      name: scene_2
-    - id: 3
-      type: string
-      optional: true
-      name: scene_3
-    - id: 4
-      type: string
-      optional: true
-      name: scene_4
diff --git a/custom_components/tuya_local/devices/s11_rfir_remote.yaml b/custom_components/tuya_local/devices/s11_rfir_remote.yaml
index d3c86d80ef..94930a1e0f 100644
--- a/custom_components/tuya_local/devices/s11_rfir_remote.yaml
+++ b/custom_components/tuya_local/devices/s11_rfir_remote.yaml
@@ -1,7 +1,12 @@
 name: Remote control
+legacy_type: moes_rfir_remote
 products:
   - id: nwpvjlq7qacvnqf3
     name: S11+ (IR+RF Pro)
+  - id: wbaloeb3kiwwhads
+    name: Moes RF/IR remote
+  - id: 0gawnyfgyneswent
+    name: IR Controller Pro
 primary_entity:
   entity: remote
   dps:
@@ -17,6 +22,7 @@ primary_entity:
     - id: 1
       type: string
       name: scene_1
+      optional: true
     - id: 2
       type: string
       optional: true