diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index cb7d8667103..215c2b47c8e 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -11502,12 +11502,12 @@ ATExecDropInherit(Relation rel, RangeVar *parent, LOCKMODE lockmode)
 	/* Off to RemoveInheritance() where most of the work happens */
 	RemoveInheritance(rel, parent_rel);
 
-	/* keep our lock on the parent relation until commit */
-	heap_close(parent_rel, NoLock);
-
 	ObjectAddressSet(address, RelationRelationId,
 					 RelationGetRelid(parent_rel));
 
+	/* keep our lock on the parent relation until commit */
+	heap_close(parent_rel, NoLock);
+
 	return address;
 }