diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 7465a27dd8fef164715a800ca548e22dc21d0fdf..8bd83619084e057e92c541b5448fcbeb90dcf6ae 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -10348,6 +10348,8 @@ ATExecSetTableSpace(Oid tableOid, Oid newTableSpace)
 		Assert(!relaosegrelid);
 		ATExecSetTableSpace(relbmrelid, newTableSpace);
 	}
+	if (OidIsValid(relbmidxid))
+		ATExecSetTableSpace(relbmidxid, newTableSpace);
 }
 
 /*