diff --git a/cli/cmd/cleanRunner.go b/cli/cmd/cleanRunner.go
index 471ef3fee..5cc3ca6b1 100644
--- a/cli/cmd/cleanRunner.go
+++ b/cli/cmd/cleanRunner.go
@@ -1,10 +1,12 @@
 package cmd
 
+import "github.com/up9inc/mizu/cli/apiserver"
+
 func performCleanCommand() {
 	kubernetesProvider, err := getKubernetesProviderForCli()
 	if err != nil {
 		return
 	}
 
-	finishMizuExecution(kubernetesProvider)
+	finishMizuExecution(kubernetesProvider, apiserver.NewProvider(GetApiServerUrl(), apiserver.DefaultRetries, apiserver.DefaultTimeout))
 }
diff --git a/cli/cmd/tapRunner.go b/cli/cmd/tapRunner.go
index 6c84b0bb1..a3f3bd2af 100644
--- a/cli/cmd/tapRunner.go
+++ b/cli/cmd/tapRunner.go
@@ -41,10 +41,11 @@ type tapState struct {
 }
 
 var state tapState
-var apiProvider = apiserver.NewProvider(GetApiServerUrl(), apiserver.DefaultRetries, apiserver.DefaultTimeout)
+var apiProvider *apiserver.Provider
 
 func RunMizuTap() {
 	mizuApiFilteringOptions, err := getMizuApiFilteringOptions()
+	apiProvider = apiserver.NewProvider(GetApiServerUrl(), apiserver.DefaultRetries, apiserver.DefaultTimeout)
 	if err != nil {
 		logger.Log.Errorf(uiUtils.Error, fmt.Sprintf("Error parsing regex-masking: %v", errormessage.FormatError(err)))
 		return
@@ -133,13 +134,13 @@ func RunMizuTap() {
 	}
 	if config.Config.Tap.DaemonMode {
 		if err := handleDaemonModePostCreation(cancel, kubernetesProvider); err != nil {
-			defer finishMizuExecution(kubernetesProvider)
+			defer finishMizuExecution(kubernetesProvider, apiProvider)
 			cancel()
 		} else {
 			logger.Log.Infof(uiUtils.Magenta, "Mizu is now running in daemon mode, run `mizu view` to connect to the mizu daemon instance")
 		}
 	} else {
-		defer finishMizuExecution(kubernetesProvider)
+		defer finishMizuExecution(kubernetesProvider, apiProvider)
 
 		if err = startTapperSyncer(ctx, cancel, kubernetesProvider, targetNamespaces, *mizuApiFilteringOptions); err != nil {
 			logger.Log.Errorf(uiUtils.Error, fmt.Sprintf("Error starting mizu tapper syncer: %v", err))
@@ -416,7 +417,7 @@ func getSyncEntriesConfig() *shared.SyncEntriesConfig {
 	}
 }
 
-func finishMizuExecution(kubernetesProvider *kubernetes.Provider) {
+func finishMizuExecution(kubernetesProvider *kubernetes.Provider, apiProvider *apiserver.Provider) {
 	telemetry.ReportAPICalls(apiProvider)
 	removalCtx, cancel := context.WithTimeout(context.Background(), cleanupTimeout)
 	defer cancel()