diff --git a/src/backend/access/gin/gindatapage.c b/src/backend/access/gin/gindatapage.c
index d65979b0e46b8f8b00debb4dd3ac9fa7cb6ba5fe..91934f0f90099f6218c4d787b13673de6bdeab0c 100644
--- a/src/backend/access/gin/gindatapage.c
+++ b/src/backend/access/gin/gindatapage.c
@@ -817,7 +817,10 @@ dataPlaceToPageLeafRecompress(Buffer buf, disassembledLeaf *leaf,
 	}
 	Assert(newsize <= GinDataLeafMaxContentSize);
 	GinDataLeafPageSetPostingListSize(page, newsize);
-	GinPageSetCompressed(page);	 /* in case it was in pre-9.4 format before */
+
+	/* Reset these in case the page was in pre-9.4 format before */
+	GinPageSetCompressed(page);
+	GinPageGetOpaque(page)->maxoff = InvalidOffsetNumber;
 
 	/* Put WAL data */
 	recompress_xlog.length = (uint16) newsize;
diff --git a/src/backend/access/gin/ginxlog.c b/src/backend/access/gin/ginxlog.c
index 9a978ce2bdb1bdb8a24b4797e30ef384539d837b..3e86590ca0d3f6c555e09ed3843954d736d015a0 100644
--- a/src/backend/access/gin/ginxlog.c
+++ b/src/backend/access/gin/ginxlog.c
@@ -153,6 +153,7 @@ ginRedoRecompress(Page page, ginxlogRecompressDataLeaf *data)
 	memcpy(segment, data->newdata, data->length - data->unmodifiedsize);
 	GinDataLeafPageSetPostingListSize(page, data->length);
 	GinPageSetCompressed(page);
+	GinPageGetOpaque(page)->maxoff = InvalidOffsetNumber;
 }
 
 static void