diff --git a/src/HassModel/NetDaemon.HassModel.CodeGenerator/Helpers/HassServiceArgumentMapper.cs b/src/HassModel/NetDaemon.HassModel.CodeGenerator/Helpers/HassServiceArgumentMapper.cs
index a3b53a571..f5b733637 100644
--- a/src/HassModel/NetDaemon.HassModel.CodeGenerator/Helpers/HassServiceArgumentMapper.cs
+++ b/src/HassModel/NetDaemon.HassModel.CodeGenerator/Helpers/HassServiceArgumentMapper.cs
@@ -22,7 +22,7 @@ private static Type GetTypeFromSelector(object? selectorObject)
             NumberSelector s when (s.Step ?? 1) % 1 != 0 => typeof(double),
             NumberSelector => typeof(long),
             TimeSelector => typeof(DateTime),
-            ObjectSelector => typeof(object),
+            ObjectSelector or null => typeof(object),
             _ => typeof(string)
         };
     }