diff --git a/src/lib/timestamp.c b/src/lib/timestamp.c
index 7e2f701..eac33a2 100644
--- a/src/lib/timestamp.c
+++ b/src/lib/timestamp.c
@@ -114,7 +114,10 @@
 
 void timestamp_init(tsc_t base)
 {
-#ifndef __PRE_RAM__
+#ifdef __PRE_RAM__
+	/* Copy of basetime, it is too early for CBMEM. */
+	ts_basetime = base;
+#else
 	struct timestamp_table* tst;
 
 	/* Locate and use an already existing table. */
@@ -123,19 +126,21 @@
 		ts_table = tst;
 		return;
 	}
-#endif
 
+	/* Copy of basetime, may be too early for CBMEM. */
+	ts_basetime = base;
 	timestamp_real_init(base);
-	if (ts_table)
-		timestamp_do_sync();
-	else
-		ts_basetime = base;
+#endif
 }
 
-#ifndef __PRE_RAM__
 void timestamp_sync(void)
 {
+#ifdef __PRE_RAM__
+	timestamp_real_init(ts_basetime);
+#else
 	if (!ts_table)
 		timestamp_init(ts_basetime);
-}
 #endif
+	if (ts_table)
+		timestamp_do_sync();
+}