diff --git a/cmd/bundle/deploy.go b/cmd/bundle/deploy.go
index 31ffe7090d..0a7df9d927 100644
--- a/cmd/bundle/deploy.go
+++ b/cmd/bundle/deploy.go
@@ -50,11 +50,7 @@ See https://docs.databricks.com/en/dev-tools/bundles/index.html for more informa
 				b.Config.Bundle.Deployment.Lock.Force = forceLock
 				b.AutoApprove = autoApprove
 
-				if cmd.Flag("compute-id").Changed {
-					b.Config.Bundle.ClusterId = clusterId
-				}
-
-				if cmd.Flag("cluster-id").Changed {
+				if cmd.Flag("compute-id").Changed || cmd.Flag("cluster-id").Changed {
 					b.Config.Bundle.ClusterId = clusterId
 				}
 				if cmd.Flag("fail-on-active-runs").Changed {
diff --git a/cmd/bundle/plan.go b/cmd/bundle/plan.go
index e3dd63929e..10d700e717 100644
--- a/cmd/bundle/plan.go
+++ b/cmd/bundle/plan.go
@@ -41,18 +41,11 @@ It is useful for previewing changes before running 'bundle deploy'.`,
 			PreDeployChecks: true,
 		}
 
-		// Only add InitFunc if we need to set force or cluster ID
-		if force || cmd.Flag("compute-id").Changed || cmd.Flag("cluster-id").Changed {
-			opts.InitFunc = func(b *bundle.Bundle) {
-				b.Config.Bundle.Force = force
+		opts.InitFunc = func(b *bundle.Bundle) {
+			b.Config.Bundle.Force = force
 
-				if cmd.Flag("compute-id").Changed {
-					b.Config.Bundle.ClusterId = clusterId
-				}
-
-				if cmd.Flag("cluster-id").Changed {
-					b.Config.Bundle.ClusterId = clusterId
-				}
+			if cmd.Flag("compute-id").Changed || cmd.Flag("cluster-id").Changed {
+				b.Config.Bundle.ClusterId = clusterId
 			}
 		}