diff --git a/aioesphomeapi/model_conversions.py b/aioesphomeapi/model_conversions.py
index 36de69d0..288fb531 100644
--- a/aioesphomeapi/model_conversions.py
+++ b/aioesphomeapi/model_conversions.py
@@ -91,48 +91,48 @@
 )
 
 SUBSCRIBE_STATES_RESPONSE_TYPES: dict[Any, type[EntityState]] = {
+    AlarmControlPanelStateResponse: AlarmControlPanelEntityState,
     BinarySensorStateResponse: BinarySensorState,
+    ClimateStateResponse: ClimateState,
     CoverStateResponse: CoverState,
+    DateStateResponse: DateState,
+    DateTimeStateResponse: DateTimeState,
     FanStateResponse: FanState,
     LightStateResponse: LightState,
+    LockStateResponse: LockEntityState,
+    MediaPlayerStateResponse: MediaPlayerEntityState,
     NumberStateResponse: NumberState,
-    DateStateResponse: DateState,
-    DateTimeStateResponse: DateTimeState,
     SelectStateResponse: SelectState,
     SensorStateResponse: SensorState,
     SirenStateResponse: SirenState,
     SwitchStateResponse: SwitchState,
-    TextStateResponse: TextState,
     TextSensorStateResponse: TextSensorState,
-    ClimateStateResponse: ClimateState,
-    LockStateResponse: LockEntityState,
-    MediaPlayerStateResponse: MediaPlayerEntityState,
-    AlarmControlPanelStateResponse: AlarmControlPanelEntityState,
+    TextStateResponse: TextState,
     TimeStateResponse: TimeState,
     ValveStateResponse: ValveState,
 }
 
 LIST_ENTITIES_SERVICES_RESPONSE_TYPES: dict[Any, type[EntityInfo] | None] = {
+    ListEntitiesAlarmControlPanelResponse: AlarmControlPanelInfo,
     ListEntitiesBinarySensorResponse: BinarySensorInfo,
     ListEntitiesButtonResponse: ButtonInfo,
+    ListEntitiesCameraResponse: CameraInfo,
+    ListEntitiesClimateResponse: ClimateInfo,
     ListEntitiesCoverResponse: CoverInfo,
+    ListEntitiesDateResponse: DateInfo,
+    ListEntitiesDateTimeResponse: DateTimeInfo,
     ListEntitiesFanResponse: FanInfo,
     ListEntitiesLightResponse: LightInfo,
+    ListEntitiesLockResponse: LockInfo,
+    ListEntitiesMediaPlayerResponse: MediaPlayerInfo,
     ListEntitiesNumberResponse: NumberInfo,
-    ListEntitiesDateResponse: DateInfo,
-    ListEntitiesDateTimeResponse: DateTimeInfo,
     ListEntitiesSelectResponse: SelectInfo,
     ListEntitiesSensorResponse: SensorInfo,
+    ListEntitiesServicesResponse: None,
     ListEntitiesSirenResponse: SirenInfo,
     ListEntitiesSwitchResponse: SwitchInfo,
     ListEntitiesTextResponse: TextInfo,
     ListEntitiesTextSensorResponse: TextSensorInfo,
-    ListEntitiesServicesResponse: None,
-    ListEntitiesCameraResponse: CameraInfo,
-    ListEntitiesClimateResponse: ClimateInfo,
-    ListEntitiesLockResponse: LockInfo,
-    ListEntitiesMediaPlayerResponse: MediaPlayerInfo,
-    ListEntitiesAlarmControlPanelResponse: AlarmControlPanelInfo,
     ListEntitiesTimeResponse: TimeInfo,
     ListEntitiesValveResponse: ValveInfo,
 }