diff --git a/csharp/App/SaliMax/src/Ess/Controller.cs b/csharp/App/SaliMax/src/Ess/Controller.cs
index 1cc305352..f8233a150 100644
--- a/csharp/App/SaliMax/src/Ess/Controller.cs
+++ b/csharp/App/SaliMax/src/Ess/Controller.cs
@@ -31,8 +31,17 @@ public static class Controller
     {
         var mode = s.SelectControlMode().WriteLine();
 
-        if (mode is EssMode.Off or EssMode.NoGridMeter)
+        if (mode is EssMode.Off) 
             return EssControl.Default;
+        
+        if (mode is EssMode.NoGridMeter)
+            return new EssControl
+            {
+                LimitedBy       = EssLimit.NoLimit,
+                Mode            = EssMode.NoGridMeter,
+                PowerCorrection = 0,
+                PowerSetpoint   = s.Battery == null ? 1000 : s.Battery.Devices.Count * s.Config.BatterySelfDischargePower // 1000 default value for heating the battery
+            };
 
         var essDelta = s.ComputePowerDelta(mode);