diff --git a/cstore_metadata_tables.c b/cstore_metadata_tables.c
index 793f3dd7f..a2eab1940 100644
--- a/cstore_metadata_tables.c
+++ b/cstore_metadata_tables.c
@@ -740,6 +740,15 @@ DeleteDataFileMetadataRowIfExists(Oid relfilenode)
 	SysScanDesc scanDescriptor = NULL;
 	HeapTuple heapTuple = NULL;
 
+	/*
+	 * During a restore for binary upgrade, metadata tables and indexes may or
+	 * may not exist.
+	 */
+	if (IsBinaryUpgrade)
+	{
+		return;
+	}
+
 	ScanKeyInit(&scanKey[0], Anum_cstore_data_files_relfilenode,
 				BTEqualStrategyNumber, F_OIDEQ, Int32GetDatum(relfilenode));