diff --git a/matrix/fed_well_known.cc b/matrix/fed_well_known.cc
index 2f3d383a6..1c71fd519 100644
--- a/matrix/fed_well_known.cc
+++ b/matrix/fed_well_known.cc
@@ -233,6 +233,14 @@ try
 		};
 	}
 
+	// Ride any duplicate request already pending
+	for(const auto &req : request::list)
+		if(req->target == target)
+			return ctx::future<string_view>
+			{
+				req->promise
+			};
+
 	// Synchronize modification of the request::list
 	const std::lock_guard request_lock
 	{