diff --git a/src/backend/distributed/commands/comment.c b/src/backend/distributed/commands/comment.c
index bdf3e7f1b..b3a4729ac 100644
--- a/src/backend/distributed/commands/comment.c
+++ b/src/backend/distributed/commands/comment.c
@@ -81,7 +81,7 @@ GetCommentForObject(Oid classOid, Oid objectOid)
 	SysScanDesc scan = systable_beginscan(shdescRelation, SharedDescriptionObjIndexId,
 										  indexOk, NULL, scanKeyCount,
 										  scanKey);
-	while ((tuple = systable_getnext(scan)) != NULL)
+	if ((tuple = systable_getnext(scan)) != NULL)
 	{
 		Form_pg_shdescription shdesc = (Form_pg_shdescription) GETSTRUCT(tuple);