diff --git a/roomserver/internal/perform_join.go b/roomserver/internal/perform_join.go
index dc786b296..bfc919e77 100644
--- a/roomserver/internal/perform_join.go
+++ b/roomserver/internal/perform_join.go
@@ -127,14 +127,23 @@ func (r *RoomserverInternalAPI) performJoinRoomByID(
 	// latest state as all of our users have left.
 	isInvitePending, inviteSender, err := r.isInvitePending(ctx, req.RoomIDOrAlias, req.UserID)
 	if err == nil && isInvitePending {
-		// Add the server of the person who invited us to the server list,
-		// as they should be a fairly good bet.
-		if _, inviterDomain, ierr := gomatrixserverlib.SplitID('@', inviteSender); ierr == nil {
-			req.ServerNames = append(req.ServerNames, inviterDomain)
+		// Check if there's an invite pending.
+		_, inviterDomain, ierr := gomatrixserverlib.SplitID('@', inviteSender)
+		if ierr != nil {
+			return fmt.Errorf("gomatrixserverlib.SplitID: %w", err)
 		}
 
-		// Perform a federated room join.
-		return r.performFederatedJoinRoomByID(ctx, req, res)
+		// Check that the domain isn't ours. If it's local then we don't
+		// need to do anythig as our own copy of the room state will be
+		// up-to-date.
+		if inviterDomain != r.Cfg.Matrix.ServerName {
+			// Add the server of the person who invited us to the server list,
+			// as they should be a fairly good bet.
+			req.ServerNames = append(req.ServerNames, inviterDomain)
+
+			// Perform a federated room join.
+			return r.performFederatedJoinRoomByID(ctx, req, res)
+		}
 	}
 
 	// Try to construct an actual join event from the template.