diff --git a/pkg/action/install.go b/pkg/action/install.go
index e4b23aceb..87752684c 100644
--- a/pkg/action/install.go
+++ b/pkg/action/install.go
@@ -553,6 +553,7 @@ func (i *Install) failRelease(rel *release.Release, err error) (*release.Release
 		uninstall.DisableHooks = i.DisableHooks
 		uninstall.KeepHistory = false
 		uninstall.Timeout = i.Timeout
+		uninstall.WaitStrategy = i.WaitStrategy
 		if _, uninstallErr := uninstall.Run(i.ReleaseName); uninstallErr != nil {
 			return rel, fmt.Errorf("an error occurred while uninstalling the release. original install error: %w: %w", err, uninstallErr)
 		}
diff --git a/pkg/action/rollback.go b/pkg/action/rollback.go
index 992f6979f..82e831789 100644
--- a/pkg/action/rollback.go
+++ b/pkg/action/rollback.go
@@ -253,7 +253,7 @@ func (r *Rollback) performRollback(currentRelease, targetRelease *release.Releas
 
 	waiter, err := r.cfg.KubeClient.GetWaiter(r.WaitStrategy)
 	if err != nil {
-		return nil, fmt.Errorf("unable to set metadata visitor from target release: %w", err)
+		return nil, fmt.Errorf("unable to get waiter: %w", err)
 	}
 	if r.WaitForJobs {
 		if err := waiter.WaitWithJobs(target, r.Timeout); err != nil {
diff --git a/pkg/action/upgrade.go b/pkg/action/upgrade.go
index 932743ce9..dc62e46a5 100644
--- a/pkg/action/upgrade.go
+++ b/pkg/action/upgrade.go
@@ -565,9 +565,7 @@ func (u *Upgrade) failRelease(rel *release.Release, created kube.ResourceList, e
 
 		rollin := NewRollback(u.cfg)
 		rollin.Version = filteredHistory[0].Version
-		if u.WaitStrategy == kube.HookOnlyStrategy {
-			rollin.WaitStrategy = kube.StatusWatcherStrategy
-		}
+		rollin.WaitStrategy = u.WaitStrategy
 		rollin.WaitForJobs = u.WaitForJobs
 		rollin.DisableHooks = u.DisableHooks
 		rollin.ForceReplace = u.ForceReplace