diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index fb080e9298f..fefa335e098 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -1340,6 +1340,12 @@ RemoveRoleFromObjectACL(Oid roleid, Oid classid, Oid objid)
 			case TableSpaceRelationId:
 				istmt.objtype = ACL_OBJECT_TABLESPACE;
 				break;
+			case ForeignServerRelationId:
+				istmt.objtype = ACL_OBJECT_FOREIGN_SERVER;
+				break;
+			case ForeignDataWrapperRelationId:
+				istmt.objtype = ACL_OBJECT_FDW;
+				break;
 			default:
 				elog(ERROR, "unexpected object class %u", classid);
 				break;