diff --git a/cli/cmd/generate_gcp.go b/cli/cmd/generate_gcp.go
index 9ac12efe4..0ea465189 100644
--- a/cli/cmd/generate_gcp.go
+++ b/cli/cmd/generate_gcp.go
@@ -540,27 +540,27 @@ func promptGcpAuditLogQuestions(
 		{
 			Prompt: &survey.Confirm{Message: QuestionGcpUseExistingPubSubTopic,
 				Default: extraState.UseExistingPubSubTopic},
-			Checks:   []*bool{&config.AuditLog},
+			Checks:   []*bool{&config.AuditLog, &config.UsePubSubAudit},
 			Required: true,
 			Response: &extraState.UseExistingPubSubTopic,
 		},
 		{
 			Prompt:   &survey.Input{Message: QuestionGcpExistingPubSubTopicId, Default: config.ExistingPubSubTopicId},
-			Checks:   []*bool{&config.AuditLog, &extraState.UseExistingPubSubTopic},
+			Checks:   []*bool{&config.AuditLog, &config.UsePubSubAudit, &extraState.UseExistingPubSubTopic},
 			Required: true,
 			Response: &config.ExistingPubSubTopicId,
 		},
 		{
 			Prompt: &survey.Confirm{Message: QuestionGcpUseExistingPubSubSubscription,
 				Default: extraState.UseExistingPubSubSubscription},
-			Checks:   []*bool{&config.AuditLog},
+			Checks:   []*bool{&config.AuditLog, &config.UsePubSubAudit},
 			Required: true,
 			Response: &extraState.UseExistingPubSubSubscription,
 		},
 		{
 			Prompt: &survey.Input{Message: QuestionGcpExistingPubSubSubscriptionName,
 				Default: config.ExistingPubSubSubscriptionName},
-			Checks:   []*bool{&config.AuditLog, &extraState.UseExistingPubSubSubscription},
+			Checks:   []*bool{&config.AuditLog, &config.UsePubSubAudit, &extraState.UseExistingPubSubSubscription},
 			Required: true,
 			Response: &config.ExistingPubSubSubscriptionName,
 		},