diff --git a/src/context/WebsocketConnection.tsx b/src/context/WebsocketConnection.tsx
index 3efd9e3e..dd667036 100644
--- a/src/context/WebsocketConnection.tsx
+++ b/src/context/WebsocketConnection.tsx
@@ -44,6 +44,7 @@ type Message = {
 	| {
 			'@context': MessageContext.DeviceLocation
 			location: GeoLocation
+			ts: number
 	  }
 	| {
 			'@context': MessageContext.DeviceShadow
@@ -128,7 +129,7 @@ export const Provider = ({ children }: { children: ComponentChildren }) => {
 						message.deviceId,
 						{
 							...message.location,
-							ts: new Date(),
+							ts: new Date(message.ts),
 						},
 						message.location.source,
 					)