diff --git a/Command/Status.hs b/Command/Status.hs
index 4f7529732d..2c0afa62c4 100644
--- a/Command/Status.hs
+++ b/Command/Status.hs
@@ -103,8 +103,9 @@ supported_remote_types = stat "supported remote types" $
 remote_list :: TrustLevel -> String -> Stat
 remote_list level desc = stat n $ lift $ do
 	us <- M.keys <$> uuidMap
-	s <- prettyPrintUUIDs n =<< fst <$> trustPartition level us
-	return $ if null s then "none" else '\n':init s
+	rs <- fst <$> trustPartition level us
+	s <- prettyPrintUUIDs n rs
+	return $ if null s then "0" else show (length rs) ++ "\n" ++ init s
 	where
 		n = desc ++ " repositories"