diff --git a/core/src/main/groovy/com/muwire/core/files/BasePersisterService.groovy b/core/src/main/groovy/com/muwire/core/files/BasePersisterService.groovy
index b6d20163..fcb8313a 100644
--- a/core/src/main/groovy/com/muwire/core/files/BasePersisterService.groovy
+++ b/core/src/main/groovy/com/muwire/core/files/BasePersisterService.groovy
@@ -53,7 +53,7 @@ abstract class BasePersisterService extends Service{
             Set<Destination> sourceSet = sources.stream().map({ d -> new Destination(d.toString())}).collect Collectors.toSet()
             DownloadedFile df = new DownloadedFile(file, ih, pieceSize, sourceSet)
             df.setComment(json.comment)
-            return new FileLoadedEvent(loadedFile : df, source : "PersisterService")
+            return new FileLoadedEvent(loadedFile : df)
         }
 
 
@@ -71,7 +71,7 @@ abstract class BasePersisterService extends Service{
                 sf.hit(searcher, timestamp, query)
             }
         }
-        return new FileLoadedEvent(loadedFile: sf, source : "PersisterService")
+        return new FileLoadedEvent(loadedFile: sf)
 
     }
 
diff --git a/core/src/main/groovy/com/muwire/core/files/PersisterService.groovy b/core/src/main/groovy/com/muwire/core/files/PersisterService.groovy
index 272ff937..a7a861cf 100644
--- a/core/src/main/groovy/com/muwire/core/files/PersisterService.groovy
+++ b/core/src/main/groovy/com/muwire/core/files/PersisterService.groovy
@@ -49,6 +49,7 @@ class PersisterService extends BasePersisterService {
                         def event = fromJson parsed
                         if (event != null) {
                             log.fine("loaded file $event.loadedFile.file")
+                            event.source = "PersisterService"
                             listener.publish event
                             loaded++
                             if (loaded % 10 == 0)