diff --git a/src/backend/replication/syncrep.c b/src/backend/replication/syncrep.c
index b3b314057c65079c3ac5aa08d5bef36ba5761ee2..24914adffd4989576ab4a9400da5ecdc07799392 100644
--- a/src/backend/replication/syncrep.c
+++ b/src/backend/replication/syncrep.c
@@ -117,24 +117,11 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)
 	{
 		return;
 	}
-
+	Assert(!am_walsender);
 	elogif(debug_walrepl_syncrep, LOG,
 			"syncrep wait -- This backend's commit LSN for syncrep is %X/%X.",
 			XactCommitLSN.xlogid,XactCommitLSN.xrecoff);
 
-	/* GPDB_91_MERGE_FIXME: is this still relevant after PT and filerep removal? */
-	/*
-	 * Walsenders are not supposed to call this function, but currently
-	 * basebackup needs to access catalog, hence open/close transaction.
-	 * It doesn't make sense to wait for myself anyway.
-	 */
-	if (am_walsender)
-	{
-		elogif(debug_walrepl_syncrep, LOG,
-				"syncrep wait -- Not waiting for syncrep as this process is a walsender.");
-		return;
-	}
-
 	/* Fast exit if user has not requested sync replication. */
 	if (!SyncRepRequested())
 		return;