diff --git a/src/NRedisStack/TimeSeries/DataTypes/TimeStamp.cs b/src/NRedisStack/TimeSeries/DataTypes/TimeStamp.cs
index d33a848d..1dfe3e76 100644
--- a/src/NRedisStack/TimeSeries/DataTypes/TimeStamp.cs
+++ b/src/NRedisStack/TimeSeries/DataTypes/TimeStamp.cs
@@ -23,7 +23,7 @@ public class TimeStamp
         /// Build a TimeStamp from DateTime.
         /// </summary>
         /// <param name="dateTime">DateTime value</param>
-        public TimeStamp(DateTime dateTime) => Value = dateTime.Ticks;
+        public TimeStamp(DateTime dateTime) => Value = new DateTimeOffset(dateTime).ToUnixTimeMilliseconds();
 
         /// <summary>
         /// Build a TimeStamp from one of the strings "-", "+", "*".
diff --git a/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestAdd.cs b/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestAdd.cs
index 21a6b3d4..31c6450a 100644
--- a/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestAdd.cs
+++ b/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestAdd.cs
@@ -210,7 +210,8 @@ public void TestOldAdd()
             ts.Create(key);
             ts.Add(key, new_dt, 1.1);
             // Adding old event
-            Assert.Equal(old_dt, ts.Add(key, old_dt, 1.1));
+            var res = ts.Add(key, old_dt, 1.1);
+            Assert.Equal(old_dt.Value, res.Value);
         }
 
         [Fact]
diff --git a/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestAddAsync.cs b/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestAddAsync.cs
index fd70c700..c7ec525d 100644
--- a/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestAddAsync.cs
+++ b/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestAddAsync.cs
@@ -228,7 +228,8 @@ public async Task TestOldAdd()
             await ts.CreateAsync(key);
             await ts.AddAsync(key, newTimeStamp, 1.1);
             // Adding old event
-            Assert.Equal(oldTimeStamp, await ts.AddAsync(key, oldTimeStamp, 1.1));
+            var res = await ts.AddAsync(key, oldTimeStamp, 1.1);
+            Assert.Equal(oldTimeStamp.Value, res.Value);
         }
 
         [Fact]
diff --git a/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMADD.cs b/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMADD.cs
index 5aa329bd..e2a22064 100644
--- a/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMADD.cs
+++ b/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMADD.cs
@@ -76,7 +76,7 @@ public void TestSuccessfulMADD()
             Assert.Equal(timestamps.Count, response.Count);
             for (int i = 0; i < response.Count; i++)
             {
-                Assert.Equal<DateTime>(timestamps[i], response[i]);
+                Assert.Equal(new DateTimeOffset(timestamps[i]).ToUnixTimeMilliseconds(), response[i].Value);
             }
         }
 
@@ -117,7 +117,7 @@ public void TestOverrideMADD()
             Assert.Equal(oldTimeStamps.Count, response.Count);
             for (int i = 0; i < response.Count; i++)
             {
-                Assert.Equal<DateTime>(oldTimeStamps[i], response[i]);
+                Assert.Equal(new DateTimeOffset(oldTimeStamps[i]).ToUnixTimeMilliseconds(), response[i].Value);
             }
         }
     }
diff --git a/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMAddAsync.cs b/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMAddAsync.cs
index 7778accf..5d5ce9c5 100644
--- a/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMAddAsync.cs
+++ b/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMAddAsync.cs
@@ -69,7 +69,7 @@ public async Task TestSuccessfulMAdd()
             Assert.Equal(timestamps.Count, response.Count);
             for (var i = 0; i < response.Count; i++)
             {
-                Assert.Equal<DateTime>(timestamps[i], response[i]);
+                Assert.Equal(new DateTimeOffset(timestamps[i]).ToUnixTimeMilliseconds(), response[i].Value);
             }
         }
 
@@ -112,7 +112,7 @@ public async Task TestOverrideMAdd()
             Assert.Equal(oldTimeStamps.Count, response.Count);
             for (int i = 0; i < response.Count; i++)
             {
-                Assert.Equal<DateTime>(oldTimeStamps[i], response[i]);
+                Assert.Equal(new DateTimeOffset(oldTimeStamps[i]).ToUnixTimeMilliseconds(), response[i].Value);
             }
         }
     }
diff --git a/tests/NRedisStack.Tests/TimeSeries/TestDataTypes/TestTimeStamp.cs b/tests/NRedisStack.Tests/TimeSeries/TestDataTypes/TestTimeStamp.cs
index 40212109..d083166c 100644
--- a/tests/NRedisStack.Tests/TimeSeries/TestDataTypes/TestTimeStamp.cs
+++ b/tests/NRedisStack.Tests/TimeSeries/TestDataTypes/TestTimeStamp.cs
@@ -25,7 +25,7 @@ public void TestTimeStampImplicitCast()
 
             DateTime now = DateTime.UtcNow;
             ts = now;
-            Assert.Equal<DateTime>(now, ts);
+            Assert.Equal(new DateTimeOffset(now).ToUnixTimeMilliseconds(), ts.Value);
 
         }
     }