diff --git a/src/Grant/AuthCodeGrant.php b/src/Grant/AuthCodeGrant.php
index d2cb0cde..eef3d045 100644
--- a/src/Grant/AuthCodeGrant.php
+++ b/src/Grant/AuthCodeGrant.php
@@ -215,6 +215,8 @@ class AuthCodeGrant extends AbstractGrant
         }
 
         $session = $code->getSession();
+        $session->associateClient($client);
+
         $authCodeScopes = $code->getScopes();
 
         // Generate the access token