diff --git a/lib/model/chatList/chatProps.dart b/lib/model/chatList/chatProps.dart
index e539e13..87502a4 100644
--- a/lib/model/chatList/chatProps.dart
+++ b/lib/model/chatList/chatProps.dart
@@ -5,7 +5,7 @@ import '../dataHolder.dart';
 
 class ChatProps extends DataHolder {
   String _queryToken = "";
-  DateTime _lastRequest = DateTime.now();
+  DateTime _lastTokenSet = DateTime.now();
 
   GetChatResponse? _getChatResponse;
   GetChatResponse get getChatResponse => _getChatResponse!;
@@ -19,14 +19,15 @@ class ChatProps extends DataHolder {
   void run() {
     notifyListeners();
     DateTime requestStart = DateTime.now();
+
     GetChatCache(
       chatToken: _queryToken,
       onUpdate: (GetChatResponse data) {
-        if(!_lastRequest.isBefore(requestStart)) return; // Another request was faster
-        _lastRequest = DateTime.now();
+        if(_lastTokenSet.isAfter(requestStart)) return; // Another request was faster
 
         _getChatResponse = data;
         notifyListeners();
+
       }
     );
   }
@@ -34,6 +35,7 @@ class ChatProps extends DataHolder {
   void setQueryToken(String token) {
     _queryToken = token;
     _getChatResponse = null;
+    _lastTokenSet = DateTime.now();
     run();
   }