diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index c350e7fe94..7df6aa07d6 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -724,7 +724,7 @@ if FEATURES.get('ENABLE_OAUTH2_PROVIDER'):
         days=ENV_TOKENS.get('OAUTH_EXPIRE_PUBLIC_CLIENT_DAYS', OAUTH_EXPIRE_PUBLIC_CLIENT_DAYS)
     )
     OAUTH_ID_TOKEN_EXPIRATION = ENV_TOKENS.get('OAUTH_ID_TOKEN_EXPIRATION', OAUTH_ID_TOKEN_EXPIRATION)
-
+    OAUTH_DELETE_EXPIRED = ENV_TOKENS.get('OAUTH_DELETE_EXPIRED', OAUTH_DELETE_EXPIRED)
 
 ##### ADVANCED_SECURITY_CONFIG #####
 ADVANCED_SECURITY_CONFIG = ENV_TOKENS.get('ADVANCED_SECURITY_CONFIG', {})
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 94c75efc89..4c39c9e810 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -2878,7 +2878,8 @@ COURSE_ABOUT_VISIBILITY_PERMISSION = 'see_exists'
 # Enrollment API Cache Timeout
 ENROLLMENT_COURSE_DETAILS_CACHE_TIMEOUT = 60
 
-
+# Automatically clean up edx-django-oauth2-provider tokens on use
+OAUTH_DELETE_EXPIRED = True
 OAUTH_ID_TOKEN_EXPIRATION = 60 * 60
 
 # These tabs are currently disabled