diff --git a/.fixme/log b/.fixme/log
index 67a187ff..5663c85e 100644
--- a/.fixme/log
+++ b/.fixme/log
@@ -245,4 +245,7 @@ fixme-set "workflow" "backlog" "G8FMaRmAga"
 (fixme-set "workflow" "test" "3YEidKkHwW")
 
 (fixme-set "assigned" "voidlizard" "8TFq4jSHUM")
-(fixme-set "workflow" "test" "8TFq4jSHUM")
\ No newline at end of file
+(fixme-set "workflow" "test" "8TFq4jSHUM")
+fixme-merged "EGPR1m3NNr" "5RbVNm9SRz"
+(fixme-set "assigned" "voidlizard" "5RbVNm9SRz")
+(fixme-set "workflow" "test" "5RbVNm9SRz")
\ No newline at end of file
diff --git a/hbs2-peer/app/BlockDownload.hs b/hbs2-peer/app/BlockDownload.hs
index 2d8f6308..f46d4839 100644
--- a/hbs2-peer/app/BlockDownload.hs
+++ b/hbs2-peer/app/BlockDownload.hs
@@ -383,7 +383,8 @@ blockDownloadLoop env0 = do
 
     peers' <- forM known $ \p -> do
                 auth <- lift $ find (KnownPeerKey p) id <&> isJust
-                if auth then
+                pinfo <- lift $ find (PeerInfoKey p) id <&> isJust
+                if auth && pinfo then
                   pure [(p,())]
                 else
                   pure mempty