diff --git a/libretroshare/src/ft/ftcontroller.cc b/libretroshare/src/ft/ftcontroller.cc
index e5bfe532f..2af200ebc 100644
--- a/libretroshare/src/ft/ftcontroller.cc
+++ b/libretroshare/src/ft/ftcontroller.cc
@@ -257,7 +257,10 @@ bool ftController::completeFile(std::string hash)
         }
 
 	/* switch map */
-	mCompleted[fc->mHash] = *fc;
+        if (fc->mFlags & RS_FILE_HINTS_CACHE) /* clean up completed cache files automatically */ 
+        {
+	        mCompleted[fc->mHash] = *fc;
+        }
 
 
 	/* for extralist additions */