diff --git a/src/Runtime/NetDaemon.Runtime.Tests/Internal/AppStateManagerTests.cs b/src/Runtime/NetDaemon.Runtime.Tests/Internal/AppStateManagerTests.cs
index c6d000291..402ccef5c 100644
--- a/src/Runtime/NetDaemon.Runtime.Tests/Internal/AppStateManagerTests.cs
+++ b/src/Runtime/NetDaemon.Runtime.Tests/Internal/AppStateManagerTests.cs
@@ -82,10 +82,10 @@ public async Task TestSaveStateAsyncReturnsCorrectStateDisabled()
         // ASSERT
         haConnectionMock.Verify(n =>
             n.GetApiCallAsync<HassState>("states/input_boolean.netdaemon_helloapp", It.IsAny<CancellationToken>()));
-        // It exists so it should turn it on
+        // It is on so it should turn it off
         haConnectionMock.Verify(n =>
-            n.SendCommandAsync(It.IsAny<CallServiceCommand>(),
-                It.IsAny<CancellationToken>()));
+            n.SendCommandAsync(It.Is<CallServiceCommand>(c => c.Domain == "input_boolean" && c.Service == "turn_off"),
+                It.IsAny<CancellationToken>()), Times.Once);
     }
 
     [Fact]
@@ -156,10 +156,10 @@ public async Task TestSetStateAsyncEnabled()
         // ASSERT
         haConnectionMock.Verify(n =>
             n.GetApiCallAsync<HassState>("states/input_boolean.netdaemon_helloapp", It.IsAny<CancellationToken>()));
-        // It exists so it should turn it on
+        // It is off so it should turn it on
         haConnectionMock.Verify(n =>
-            n.SendCommandAsync(It.IsAny<CallServiceCommand>(),
-                It.IsAny<CancellationToken>()));
+            n.SendCommandAsync(It.Is<CallServiceCommand>(c => c.Domain == "input_boolean" && c.Service == "turn_on"),
+                It.IsAny<CancellationToken>()), Times.Once);
     }
 
     [Fact]
diff --git a/src/Runtime/NetDaemon.Runtime/Internal/AppStateManager.cs b/src/Runtime/NetDaemon.Runtime/Internal/AppStateManager.cs
index 13ca23373..a26e5b699 100644
--- a/src/Runtime/NetDaemon.Runtime/Internal/AppStateManager.cs
+++ b/src/Runtime/NetDaemon.Runtime/Internal/AppStateManager.cs
@@ -69,7 +69,7 @@ public async Task SaveStateAsync(string applicationId, ApplicationState state)
             (state == ApplicationState.Disabled && isEnabled)
             )
         {
-            await appStateRepository.UpdateAsync(applicationId, isEnabled, _cancelTokenSource.Token)
+            await appStateRepository.UpdateAsync(applicationId, state == ApplicationState.Enabled, _cancelTokenSource.Token)
                 .ConfigureAwait(false);
         }
     }