diff --git a/src/main/java/com/bunq/sdk/http/ApiClient.java b/src/main/java/com/bunq/sdk/http/ApiClient.java
index fd1ce4dc..e72633c0 100644
--- a/src/main/java/com/bunq/sdk/http/ApiClient.java
+++ b/src/main/java/com/bunq/sdk/http/ApiClient.java
@@ -1,6 +1,7 @@
 package com.bunq.sdk.http;
 
 import com.bunq.sdk.context.ApiContext;
+import com.bunq.sdk.context.BunqContext;
 import com.bunq.sdk.context.InstallationContext;
 import com.bunq.sdk.exception.ApiException;
 import com.bunq.sdk.exception.BunqException;
@@ -242,8 +243,8 @@ private Response executeRequest(
       Map<String, String> customHeaders,
       String uri
   ) throws IOException {
-    if (!URIS_NOT_REQUIRING_ACTIVE_SESSION.contains(uri)) {
-      apiContext.ensureSessionActive();
+    if (!URIS_NOT_REQUIRING_ACTIVE_SESSION.contains(uri) && apiContext.ensureSessionActive()) {
+        BunqContext.updateApiContext(apiContext);
     }
 
     setHeaders(request, customHeaders);