diff --git a/pkg/action/install.go b/pkg/action/install.go
index 5ae12904d..0af3b88ff 100644
--- a/pkg/action/install.go
+++ b/pkg/action/install.go
@@ -506,6 +506,22 @@ func (i *Install) performInstall(rel *release.Release, toBeAdopted kube.Resource
 	if err != nil {
 		return rel, err
 	}
+	
+	if !i.Wait && !i.DisableHooks {
+		// Check if there are any post-* hooks
+		hasPostHooks := false
+		for _, hook := range release.Hooks {
+			if strings.HasPrefix(hook.Kind, "post-") {
+				hasPostHooks = true
+				break
+			}
+		}
+
+		// Enable wait flag if there are post-* hooks
+		if hasPostHooks {
+			i.Wait = true
+		}
+	}
 
 	waiter, err := i.cfg.KubeClient.GetWaiter(i.WaitStrategy)
 	if err != nil {
@@ -527,6 +543,7 @@ func (i *Install) performInstall(rel *release.Release, toBeAdopted kube.Resource
 		}
 	}
 
+
 	if len(i.Description) > 0 {
 		rel.SetStatus(release.StatusDeployed, i.Description)
 	} else {