diff --git a/Assistant/Threads/Watcher.hs b/Assistant/Threads/Watcher.hs
index 58c4c2e302..88efa39d89 100644
--- a/Assistant/Threads/Watcher.hs
+++ b/Assistant/Threads/Watcher.hs
@@ -203,9 +203,12 @@ onAddDirect symlinkssupported matcher file fs = do
 				 - really modified, but it might have
 				 - just been deleted and been put back,
 				 - so it symlink is restaged to make sure. -}
-				( do
-					link <- liftAnnex $ inRepo $ gitAnnexLink file key
-					addLink file link (Just key)
+				( ifM (scanComplete <$> getDaemonStatus)
+					( do
+						link <- liftAnnex $ inRepo $ gitAnnexLink file key
+						addLink file link (Just key)
+					, noChange
+					)
 				, guardSymlinkStandin (Just key) $ do
 					debug ["changed direct", file]
 					liftAnnex $ changedDirect key file