diff --git a/lib/src/platform/src/codec.dart b/lib/src/platform/src/codec.dart
index 2e8c9305f..408198190 100644
--- a/lib/src/platform/src/codec.dart
+++ b/lib/src/platform/src/codec.dart
@@ -641,13 +641,16 @@ class Codec extends StandardMessageCodec {
 
   /// Decodes value [jsonMap] to [TokenParams]
   /// returns null if [jsonMap] is null
-  TokenParams _decodeTokenParams(Map<String, dynamic> jsonMap) => TokenParams()
-    ..capability = _readFromJson<String>(jsonMap, TxTokenParams.capability)
-    ..clientId = _readFromJson<String>(jsonMap, TxTokenParams.clientId)
-    ..nonce = _readFromJson<String>(jsonMap, TxTokenParams.nonce)
-    ..timestamp = DateTime.fromMillisecondsSinceEpoch(
-        _readFromJson<int>(jsonMap, TxTokenParams.timestamp)!)
-    ..ttl = _readFromJson<int>(jsonMap, TxTokenParams.ttl);
+  TokenParams _decodeTokenParams(Map<String, dynamic> jsonMap) {
+    final timestamp = _readFromJson<int>(jsonMap, TxTokenParams.timestamp);
+    final params = TokenParams()
+      ..capability = _readFromJson<String>(jsonMap, TxTokenParams.capability)
+      ..clientId = _readFromJson<String>(jsonMap, TxTokenParams.clientId)
+      ..nonce = _readFromJson<String>(jsonMap, TxTokenParams.nonce)
+      ..timestamp = (timestamp != null) ? DateTime.fromMillisecondsSinceEpoch(timestamp) : null
+      ..ttl = _readFromJson<int>(jsonMap, TxTokenParams.ttl);
+    return params;
+  }
 
   /// Decodes value [jsonMap] to [AblyMessage]
   /// returns null if [jsonMap] is null