diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 03d43fdada1..7fa6fc996dc 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -1323,8 +1323,6 @@ PathNameOpenFile(FileName fileName, int fileFlags, int fileMode)
 	DO_DB(elog(LOG, "PathNameOpenFile: success %d",
 			   vfdP->fd));
 
-	Insert(file);
-
 	vfdP->fileName = fnamecopy;
 	/* Saved flags are adjusted to be OK for re-opening file */
 	vfdP->fileFlags = fileFlags & ~(O_CREAT | O_TRUNC | O_EXCL);
@@ -1334,6 +1332,8 @@ PathNameOpenFile(FileName fileName, int fileFlags, int fileMode)
 	vfdP->fdstate = 0x0;
 	vfdP->resowner = NULL;
 
+	Insert(file);
+
 	return file;
 }