diff --git a/src/ui/task/taskinfozonedownloader.cpp b/src/ui/task/taskinfozonedownloader.cpp
index dda97bfd..1941c697 100644
--- a/src/ui/task/taskinfozonedownloader.cpp
+++ b/src/ui/task/taskinfozonedownloader.cpp
@@ -30,8 +30,6 @@ bool TaskInfoZoneDownloader::processResult(bool success)
     if (!success)
         return false;
 
-    removeOrphanCacheFiles();
-
     fortManager()->showTrayMessage(tr("Zone Addresses Updated: %1.")
                                    .arg(m_zoneNames.join(", ")));
     return true;
@@ -47,8 +45,6 @@ void TaskInfoZoneDownloader::loadZones()
         addSubResult(&worker, false);
     }
 
-    removeOrphanCacheFiles();
-
     emitZonesUpdated();
 }
 
@@ -184,6 +180,8 @@ void TaskInfoZoneDownloader::emitZonesUpdated()
 {
     emit zonesUpdated(m_dataZonesMask, m_enabledMask, m_dataSize, m_zonesData);
 
+    removeOrphanCacheFiles();
+
     clearSubResults();
 }