diff --git a/api/components/OAuth2/Storage/AccessTokenStorage.php b/api/components/OAuth2/Storage/AccessTokenStorage.php
index fdeb14c..c31742b 100644
--- a/api/components/OAuth2/Storage/AccessTokenStorage.php
+++ b/api/components/OAuth2/Storage/AccessTokenStorage.php
@@ -16,6 +16,9 @@ class AccessTokenStorage extends AbstractStorage implements AccessTokenInterface
 
     public function get($token) {
         $result = Json::decode((new Key($this->dataTable, $token))->getValue());
+        if ($result === null) {
+            return null;
+        }
 
         $token = new AccessTokenEntity($this->server);
         $token->setId($result['id']);