diff --git a/src/tools/mac/upload_system_symbols/upload_system_symbols.go b/src/tools/mac/upload_system_symbols/upload_system_symbols.go
index 03acb16c..8f5c773f 100644
--- a/src/tools/mac/upload_system_symbols/upload_system_symbols.go
+++ b/src/tools/mac/upload_system_symbols/upload_system_symbols.go
@@ -113,6 +113,11 @@ func main() {
 	flag.Parse()
 	log.SetFlags(0)
 
+	// If `apiKey` is set, we're using the v2 protocol.
+	if len(*apiKey) > 0 {
+		uploadServers = uploadServersV2
+	}
+
 	var uq *UploadQueue
 
 	if *uploadOnlyPath != "" {
@@ -149,10 +154,6 @@ func main() {
 			defer os.RemoveAll(p)
 		}
 	}
-	// If `apiKey` is set, we're using the v2 protocol.
-	if len(*apiKey) > 0 {
-		uploadServers = uploadServersV2
-	}
 
 	dq := StartDumpQueue(*systemRoot, dumpPath, uq)
 	dq.Wait()