diff --git a/internal/ota/ota.go b/internal/ota/ota.go
index 1ea6a356..095fec40 100644
--- a/internal/ota/ota.go
+++ b/internal/ota/ota.go
@@ -137,10 +137,6 @@ func (s *State) doUpdate(ctx context.Context, params UpdateParams) error {
 	if !params.CheckOnly {
 		s.updating = true
 		s.triggerStateUpdate()
-		defer func() {
-			s.updating = false
-			s.triggerStateUpdate()
-		}()
 	}
 
 	appUpdate, systemUpdate, err := s.getUpdateStatus(ctx, params)
@@ -152,6 +148,8 @@ func (s *State) doUpdate(ctx context.Context, params UpdateParams) error {
 	s.triggerStateUpdate()
 
 	if params.CheckOnly {
+		s.updating = false
+		s.triggerStateUpdate()
 		return nil
 	}