diff --git a/src/main/java/io/kuzzle/sdk/Kuzzle.java b/src/main/java/io/kuzzle/sdk/Kuzzle.java
index 84f5a825..e4fec391 100644
--- a/src/main/java/io/kuzzle/sdk/Kuzzle.java
+++ b/src/main/java/io/kuzzle/sdk/Kuzzle.java
@@ -197,16 +197,15 @@ protected void onResponseReceived(final Object... payload) {
       return;
     }
 
-    if (response.error.id == null
-        || !response.error.id.equals("security.token.expired")) {
-      final Task<Response> task = requests.get(response.requestId);
-      if (task != null) {
-        task.setException(new ApiErrorException(response));
-      }
-      return;
+    final Task<Response> task = requests.get(response.requestId);
+    if (task != null) {
+      task.setException(new ApiErrorException(response));
     }
+    requests.remove(response.requestId);
 
-    super.trigger(Event.tokenExpired);
+    if (response.error.id != null && response.error.id.equals("security.token.expired")) {
+      super.trigger(Event.tokenExpired);
+    }
   }
 
   protected void onStateChanged(final Object... args) {