diff --git a/Command/P2PHttp.hs b/Command/P2PHttp.hs
index cb2c752055..16b7ce789e 100644
--- a/Command/P2PHttp.hs
+++ b/Command/P2PHttp.hs
@@ -135,7 +135,11 @@ startIO o
 		repos <- findRepos o
 		sts <- forM repos $ \r -> do
 			strd <- Annex.new r
-			Annex.eval strd $ mkServerState o authenv
+			Annex.eval strd $
+				ifM ((/=) NoUUID <$> getUUID)
+					( mkServerState o authenv
+					, return mempty
+					)
 		runServer o (mconcat sts)
 
 runServer :: Options -> P2PHttpServerState -> IO ()