diff --git a/homeassistant/components/tuya/__init__.py b/homeassistant/components/tuya/__init__.py
index a9e65556e38..47143f3595c 100644
--- a/homeassistant/components/tuya/__init__.py
+++ b/homeassistant/components/tuya/__init__.py
@@ -89,6 +89,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: TuyaConfigEntry) -> bool
             manufacturer="Tuya",
             name=device.name,
             model=f"{device.product_name} (unsupported)",
+            model_id=device.product_id,
         )
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
diff --git a/homeassistant/components/tuya/base.py b/homeassistant/components/tuya/base.py
index 8b161f0538f..99d81848a91 100644
--- a/homeassistant/components/tuya/base.py
+++ b/homeassistant/components/tuya/base.py
@@ -151,7 +151,8 @@ class TuyaEntity(Entity):
             identifiers={(DOMAIN, self.device.id)},
             manufacturer="Tuya",
             name=self.device.name,
-            model=f"{self.device.product_name} ({self.device.product_id})",
+            model=self.device.product_name,
+            model_id=self.device.product_id,
         )
 
     @property
diff --git a/homeassistant/components/tuya/scene.py b/homeassistant/components/tuya/scene.py
index 1465724faac..dbc849356b2 100644
--- a/homeassistant/components/tuya/scene.py
+++ b/homeassistant/components/tuya/scene.py
@@ -8,7 +8,7 @@ from tuya_sharing import Manager, SharingScene
 
 from homeassistant.components.scene import Scene
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from . import TuyaConfigEntry
@@ -46,6 +46,7 @@ class TuyaSceneEntity(Scene):
             manufacturer="tuya",
             name=self.scene.name,
             model="Tuya Scene",
+            entry_type=DeviceEntryType.SERVICE,
         )
 
     @property