diff --git a/src/lib/timestamp.c b/src/lib/timestamp.c
index 51e63b2..7ead383 100644
--- a/src/lib/timestamp.c
+++ b/src/lib/timestamp.c
@@ -34,7 +34,7 @@
 #define MAX_TIMESTAMP_CACHE 16
 
 struct __attribute__((__packed__)) timestamp_cache {
-	int cache_state;
+	uint32_t cache_state;
 	struct timestamp_table table;
 	/* The struct timestamp_table has a 0 length array as its last field.
 	 * The  following 'entries' array serves as the storage space for the
@@ -199,6 +199,13 @@
 		return;
 	}
 
+	/* In the EARLY_CBMEM_INIT case timestamps could have already been
+	 * recovered. In those circumstances honor the cache which sits in BSS
+	 * as it has already been initialized. */
+	if (ENV_RAMSTAGE &&
+	    ts_cache->cache_state != TIMESTAMP_CACHE_UNINITIALIZED)
+		return;
+
 	timestamp_cache_init(ts_cache, base);
 }