diff --git a/putils/run-with-spinner.go b/putils/run-with-spinner.go
index 89e949b7e..05b27ed0c 100644
--- a/putils/run-with-spinner.go
+++ b/putils/run-with-spinner.go
@@ -10,7 +10,10 @@ func RunWithSpinner(spinner *pterm.SpinnerPrinter, f func(spinner *pterm.Spinner
 	}
 
 	err = f(s)
-	s.Stop()
+
+	if s.IsActive {
+		s.Stop()
+	}
 
 	return err
 }