diff --git a/build/dependencies/setupCidr.gradle b/build/dependencies/setupCidr.gradle
index 9d2d2f4b0492..35223d9b08ea 100644
--- a/build/dependencies/setupCidr.gradle
+++ b/build/dependencies/setupCidr.gradle
@@ -100,10 +100,12 @@ task setupCidr
 }
 
 task cleanSetupCidr() {
-  setupCidr.dependsOn.each { setupToolTask ->
-    def downloadToolTask = setupToolTask.dependsOn.first()
-    delete setupToolTask.outputs.files.singleFile
-    delete downloadToolTask.outputs.files.singleFile
+  doLast {
+    setupCidr.dependsOn.each { setupToolTask ->
+      def downloadToolTask = setupToolTask.dependsOn.first()
+      delete setupToolTask.outputs.files.singleFile
+      delete downloadToolTask.outputs.files.singleFile
+    }
   }
 }