diff --git a/cmd/gomote/push.go b/cmd/gomote/push.go
index 20c309a630..5598e99f50 100644
--- a/cmd/gomote/push.go
+++ b/cmd/gomote/push.go
@@ -105,15 +105,18 @@ func doPush(ctx context.Context, name, goroot string, dryRun, detailedProgress b
 			remote[en[len("go/"):]] = de
 		}
 	}
-	logf("installing go-bootstrap version in the working directory")
-	if dryRun {
-		logf("(Dry-run) Would have pushed go-bootstrap")
-	} else {
-		_, err := client.AddBootstrap(ctx, &protos.AddBootstrapRequest{
-			GomoteId: name,
-		})
-		if err != nil {
-			return fmt.Errorf("unable to add bootstrap version of Go to instance: %w", err)
+	// TODO(66635) remove once gomotes can no longer be created via the coordinator.
+	if luciDisabled() {
+		logf("installing go-bootstrap version in the working directory")
+		if dryRun {
+			logf("(Dry-run) Would have pushed go-bootstrap")
+		} else {
+			_, err := client.AddBootstrap(ctx, &protos.AddBootstrapRequest{
+				GomoteId: name,
+			})
+			if err != nil {
+				return fmt.Errorf("unable to add bootstrap version of Go to instance: %w", err)
+			}
 		}
 	}
 
diff --git a/cmd/gomote/put.go b/cmd/gomote/put.go
index c2a93f6f0a..ede3526f74 100644
--- a/cmd/gomote/put.go
+++ b/cmd/gomote/put.go
@@ -235,15 +235,18 @@ func putBootstrap(args []string) error {
 	for _, inst := range putSet {
 		inst := inst
 		eg.Go(func() error {
-			client := gomoteServerClient(ctx)
-			resp, err := client.AddBootstrap(ctx, &protos.AddBootstrapRequest{
-				GomoteId: inst,
-			})
-			if err != nil {
-				return fmt.Errorf("unable to add bootstrap version of Go to instance: %w", err)
-			}
-			if resp.GetBootstrapGoUrl() == "" {
-				fmt.Printf("No GoBootstrapURL defined for %q; ignoring. (may be baked into image)\n", inst)
+			// TODO(66635) remove once gomotes can no longer be created via the coordinator.
+			if luciDisabled() {
+				client := gomoteServerClient(ctx)
+				resp, err := client.AddBootstrap(ctx, &protos.AddBootstrapRequest{
+					GomoteId: inst,
+				})
+				if err != nil {
+					return fmt.Errorf("unable to add bootstrap version of Go to instance: %w", err)
+				}
+				if resp.GetBootstrapGoUrl() == "" {
+					fmt.Printf("No GoBootstrapURL defined for %q; ignoring. (may be baked into image)\n", inst)
+				}
 			}
 			return nil
 		})