diff --git a/src/storage/version/put.js b/src/storage/version/put.js
index 78989b71..3b71244b 100644
--- a/src/storage/version/put.js
+++ b/src/storage/version/put.js
@@ -120,7 +120,7 @@ export async function putObjectWithVersion(env, daCtx, update, body, guid) {
     Ext: daCtx.ext,
     Metadata: {
       Users: current.metadata?.users || JSON.stringify([{ email: 'anonymous' }]),
-      Timestamp: current.metadata?.timestamp || Timestamp,
+      Timestamp,
       Path: current.metadata?.path || Path,
       Label,
     },
@@ -134,7 +134,12 @@ export async function putObjectWithVersion(env, daCtx, update, body, guid) {
   const command = new PutObjectCommand({
     ...input,
     Metadata: {
-      ID, Version: crypto.randomUUID(), Users, Timestamp, Path, Preparsingstore,
+      ID,
+      Version: crypto.randomUUID(),
+      Users,
+      Timestamp: current.metadata?.timestamp || Timestamp,
+      Path,
+      Preparsingstore,
     },
   });
   try {
diff --git a/test/storage/version/put.test.js b/test/storage/version/put.test.js
index 50321161..b3f3f247 100644
--- a/test/storage/version/put.test.js
+++ b/test/storage/version/put.test.js
@@ -146,6 +146,7 @@ describe('Version Put', () => {
           metadata: {
             id: 'x123',
             version: 'aaa-bbb',
+            timestamp: 1750765279755,
           },
           status: 200
         };
@@ -201,7 +202,7 @@ describe('Version Put', () => {
     assert.equal('x123', s3Sent[0].input.Metadata.ID);
     assert.equal('/a/x.html', s3Sent[0].input.Metadata.Path);
     assert.notEqual('aaa-bbb', s3Sent[0].input.Metadata.Version);
-    assert(s3Sent[0].input.Metadata.Timestamp > 0);
+    assert.strictEqual(1750765279755, s3Sent[0].input.Metadata.Timestamp);
   });
 
   it('Put Object With Version don\'t store content', async () => {
@@ -498,8 +499,8 @@ describe('Version Put', () => {
     assert.equal('', input.Body, 'Empty body for HEAD');
     assert.equal(0, input.ContentLength, 'Should have used 0 as content length for HEAD');
     assert.equal('/q', input.Metadata.Path);
-    assert.equal(123, input.Metadata.Timestamp);
     assert.equal('[{"email":"anonymous"}]', input.Metadata.Users);
+    assert(input.Metadata.Timestamp > 0);
   });
 
   it('Test putObjectWithVersion BODY', async () => {
@@ -563,8 +564,8 @@ describe('Version Put', () => {
     assert.equal('Somebody...', input.Body);
     assert.equal(616, input.ContentLength);
     assert.equal('/qwerty', input.Metadata.Path);
-    assert.equal(1234, input.Metadata.Timestamp);
     assert.equal('[{"email":"anonymous"}]', input.Metadata.Users);
+    assert(input.Metadata.Timestamp > 0);
 
     assert.equal(1, sentToS3_2.length);
     const input2 = sentToS3_2[0].input;
@@ -574,6 +575,7 @@ describe('Version Put', () => {
     assert.equal('/mypath', input2.Key);
     assert.equal('/mypath', input2.Metadata.Path);
     assert.equal('[{"email":"hi@acme.com"}]', input2.Metadata.Users);
+    assert.strictEqual(1234, input2.Metadata.Timestamp);
     assert(input2.Metadata.Version && input2.Metadata.Version !== 101);
   });
 });