diff --git a/src/backend/distributed/planner/query_pushdown_planning.c b/src/backend/distributed/planner/query_pushdown_planning.c
index cbe6a3606..98b118a09 100644
--- a/src/backend/distributed/planner/query_pushdown_planning.c
+++ b/src/backend/distributed/planner/query_pushdown_planning.c
@@ -422,38 +422,14 @@ IsOuterJoinExpr(Node *node)
 bool
 SafeToPushdownWindowFunction(Query *query, StringInfo *errorDetail)
 {
-	ListCell *windowClauseCell = NULL;
-	List *windowClauseList = query->windowClause;
-
-	/*
-	 * We need to check each window clause separately if there is a partition by clause
-	 * and if it is partitioned on the distribution column.
-	 */
-	foreach(windowClauseCell, windowClauseList)
-	{
-		WindowClause *windowClause = lfirst(windowClauseCell);
-
-		if (!windowClause->partitionClause)
-		{
-			if (errorDetail)
-			{
-				*errorDetail = makeStringInfo();
-				appendStringInfoString(*errorDetail,
-									   "Window functions without PARTITION BY on distribution "
-									   "column is currently unsupported");
-			}
-			return false;
-		}
-	}
-
 	if (!WindowPartitionOnDistributionColumn(query))
 	{
 		if (errorDetail)
 		{
 			*errorDetail = makeStringInfo();
 			appendStringInfoString(*errorDetail,
-								   "Window functions with PARTITION BY list missing distribution "
-								   "column is currently unsupported");
+								   "Window functions should have a PARTITION BY clause list "
+								   "that contains distribution column");
 		}
 		return false;
 	}