diff --git a/ordering-keys-prober/src/main/java/com/google/cloud/pubsub/prober/ProberStarter.java b/ordering-keys-prober/src/main/java/com/google/cloud/pubsub/prober/ProberStarter.java
index 858f7841..a6be3c32 100644
--- a/ordering-keys-prober/src/main/java/com/google/cloud/pubsub/prober/ProberStarter.java
+++ b/ordering-keys-prober/src/main/java/com/google/cloud/pubsub/prober/ProberStarter.java
@@ -40,8 +40,8 @@ public static class Args {
     @Parameter(names = "--endpoint", description = "Cloud Pub/Sub endpoint to run against.")
     private String endpoint = "pubsub.googleapis.com:443";
 
-    @Parameter(names = "--should_cleanup", description ="Whether the prober should start by cleaning up the topic and subscription.")
-    private boolean shouldCleanup = true;
+    @Parameter(names = "--no_cleanup", description = "Skip the cleanup of the topic and subscription on startup.")
+    private boolean noCleanup = false;
 
     @Parameter(names = "--no_publish", description ="Whether the prober should skip publishing.")
     private boolean noPublish = false;
@@ -176,7 +176,7 @@ public static void main(String[] args) throws IOException {
     builder
         .setProject(parsedArgs.project)
         .setEndpoint(parsedArgs.endpoint)
-        .setShouldCleanup(parsedArgs.shouldCleanup)
+        .setShouldCleanup(!parsedArgs.noCleanup)
         .setNoPublish(parsedArgs.noPublish)
         .setTopicName(parsedArgs.topicName)
         .setSubscriptionName(parsedArgs.subscriptionName)