diff --git a/Client/Filesystem/FilesystemDiff.go b/Client/Filesystem/FilesystemDiff.go
index 731d93e..63887a3 100644
--- a/Client/Filesystem/FilesystemDiff.go
+++ b/Client/Filesystem/FilesystemDiff.go
@@ -119,13 +119,12 @@ func (fsStatus *FilesystemStatus) parseFile(indexBucket, picksBucket *bolt.Bucke
 		fsStatusWG.Done()
 	}()
 
-	fsStatusWG.Wait()
-	fsStatusWG.Add(1)
-
 	pick = picksBucket.Get([]byte(p))
 	known = indexBucket.Get([]byte(p))
 
 	if pick != nil {
+		fsStatusWG.Wait()
+		fsStatusWG.Add(1)
 		fsStatus.PickedFiles = append(fsStatus.PickedFiles, p)
 		return
 	}
@@ -143,6 +142,8 @@ func (fsStatus *FilesystemStatus) parseFile(indexBucket, picksBucket *bolt.Bucke
 
 		e = newFileObject.IsDifferent(knownFileObject)
 		if e != nil {
+			fsStatusWG.Wait()
+			fsStatusWG.Add(1)
 			fsStatus.ModifiedFiles = append(fsStatus.ModifiedFiles, p)
 		}