diff --git a/AUTHORS b/AUTHORS
index 8596063b9..fb19362b6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -75,6 +75,7 @@ Julien Palard
 Jun Zhou
 Kaleb Porter
 Kristian Rune Larsen
+Lazaros Toumanidis
 Ludwig Hähne
 Łukasz Skarżyński
 Marcus Sonestedt
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1e9704d7..216ea20f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * #1336 Fix encapsulation for Redirect URI scheme validation
 * #1357 Move import of setting_changed signal from test to django core modules
 * #1268 fix prompt=none redirects to login screen
+* #1381 fix AttributeError in OAuth2ExtraTokenMiddleware when a custom AccessToken model is used
 
 ### Removed
 * #1350 Remove support for Python 3.7 and Django 2.2
diff --git a/oauth2_provider/middleware.py b/oauth2_provider/middleware.py
index 28bd968f8..de1689894 100644
--- a/oauth2_provider/middleware.py
+++ b/oauth2_provider/middleware.py
@@ -3,7 +3,7 @@
 from django.contrib.auth import authenticate
 from django.utils.cache import patch_vary_headers
 
-from oauth2_provider.models import AccessToken
+from oauth2_provider.models import get_access_token_model
 
 
 log = logging.getLogger(__name__)
@@ -53,6 +53,7 @@ def __call__(self, request):
         authheader = request.META.get("HTTP_AUTHORIZATION", "")
         if authheader.startswith("Bearer"):
             tokenstring = authheader.split()[1]
+            AccessToken = get_access_token_model()
             try:
                 token = AccessToken.objects.get(token=tokenstring)
                 request.access_token = token