diff --git a/client/ui/debug.go b/client/ui/debug.go
index 54fe49946..df1bb5f86 100644
--- a/client/ui/debug.go
+++ b/client/ui/debug.go
@@ -289,6 +289,8 @@ func (s *serviceClient) handleRunForDuration(
 		return
 	}
 
+	defer s.restoreServiceState(conn, initialState)
+
 	if err := s.collectDebugData(conn, initialState, params, progressUI); err != nil {
 		handleError(progressUI, err.Error())
 		return
@@ -299,8 +301,6 @@ func (s *serviceClient) handleRunForDuration(
 		return
 	}
 
-	s.restoreServiceState(conn, initialState)
-
 	progressUI.statusLabel.SetText("Bundle created successfully")
 }