diff --git a/cms/envs/devstack.py b/cms/envs/devstack.py
index 26461ef708..c9e484f2c8 100644
--- a/cms/envs/devstack.py
+++ b/cms/envs/devstack.py
@@ -108,7 +108,8 @@ DEBUG_TOOLBAR_CONFIG = {
 
 def should_show_debug_toolbar(request):
     # We always want the toolbar on devstack unless running tests from another Docker container
-    if request.get_host().startswith('edx.devstack.studio:'):
+    hostname = request.get_host()
+    if hostname.startswith('edx.devstack.studio:') or hostname.startswith('studio.devstack.edx:'):
         return False
     return True
 
diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py
index b34699517d..03c7962b2c 100644
--- a/lms/envs/devstack.py
+++ b/lms/envs/devstack.py
@@ -105,7 +105,8 @@ DEBUG_TOOLBAR_CONFIG = {
 
 def should_show_debug_toolbar(request):
     # We always want the toolbar on devstack unless running tests from another Docker container
-    if request.get_host().startswith('edx.devstack.lms:'):
+    hostname = request.get_host()
+    if hostname.startswith('edx.devstack.lms:') or hostname.startswith('lms.devstack.edx:'):
         return False
     return True