diff --git a/src/HassModel/NetDaemon.HassModel.CodeGenerator/Helpers/EntityIdHelper.cs b/src/HassModel/NetDaemon.HassModel.CodeGenerator/Helpers/EntityIdHelper.cs
index e8b1f6cdf..a868d5880 100644
--- a/src/HassModel/NetDaemon.HassModel.CodeGenerator/Helpers/EntityIdHelper.cs
+++ b/src/HassModel/NetDaemon.HassModel.CodeGenerator/Helpers/EntityIdHelper.cs
@@ -2,7 +2,7 @@
 
 internal static class EntityIdHelper
 {
-    public static readonly string[] NumericDomains = { "input_number", "number" };
+    public static readonly string[] NumericDomains = { "input_number", "number", "proximity" };
     public static readonly string[] MixedDomains = { "sensor" };
 
     public static string GetDomain(string str)
diff --git a/src/HassModel/NetDaemon.HassModel.Tests/CodeGenerator/CodeGeneratorTest.cs b/src/HassModel/NetDaemon.HassModel.Tests/CodeGenerator/CodeGeneratorTest.cs
index c5b261113..6ce15e79f 100644
--- a/src/HassModel/NetDaemon.HassModel.Tests/CodeGenerator/CodeGeneratorTest.cs
+++ b/src/HassModel/NetDaemon.HassModel.Tests/CodeGenerator/CodeGeneratorTest.cs
@@ -81,6 +81,10 @@ public void TestNumericSensorEntityGeneration()
             new()
             {
                 EntityId = "sensor.Pir",
+            },            
+            new()
+            {
+                EntityId = "proximity.home",
             },
         };
 
@@ -106,6 +110,9 @@ public void Run(IHaContext ha)
 
                                 SensorEntity pirSensor = entities.Sensor.Pir;
                                 string? pir = pirSensor.State;
+
+                                ProximityEntity homeProximity = entities.Proximity.Home;
+                                double? distance = homeProximity.State;
                              }
                         }
                         """;