diff --git a/pgxn/neon/pagestore_smgr.c b/pgxn/neon/pagestore_smgr.c
index 8df544c581..cc46dfd935 100644
--- a/pgxn/neon/pagestore_smgr.c
+++ b/pgxn/neon/pagestore_smgr.c
@@ -3038,6 +3038,13 @@ neon_immedsync(SMgrRelation reln, ForkNumber forknum)
 			break;
 
 		case RELPERSISTENCE_PERMANENT:
+			if (stop_unlogged_build(InfoFromSMgrRel(reln), forknum))
+			{
+				mdclose(reln, forknum);
+				/* use isRedo == true, so that we drop it immediately */
+				mdunlink(InfoBFromSMgrRel(reln), forknum, true);
+				resume_unlogged_build(); /* doesn't actually resume build, just release lock */
+			}
 			break;
 
 		case RELPERSISTENCE_TEMP: