diff --git a/awx/api/generics.py b/awx/api/generics.py
index 3118a86a20..5b9ea1e176 100644
--- a/awx/api/generics.py
+++ b/awx/api/generics.py
@@ -110,7 +110,7 @@ class LoggedLoginView(auth_views.LoginView):
 
 class LoggedLogoutView(auth_views.LogoutView):
 
-    success_url_allowed_hosts = settings.LOGOUT_ALLOWED_HOSTS
+    success_url_allowed_hosts = set(settings.LOGOUT_ALLOWED_HOSTS.split(",")) if settings.LOGOUT_ALLOWED_HOSTS else set()
 
     def dispatch(self, request, *args, **kwargs):
         original_user = getattr(request, 'user', None)
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index 5e5f8d886f..9a144777bb 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -114,7 +114,7 @@ MEDIA_ROOT = os.path.join(BASE_DIR, 'public', 'media')
 MEDIA_URL = '/media/'
 
 LOGIN_URL = '/api/login/'
-LOGOUT_ALLOWED_HOSTS = []
+LOGOUT_ALLOWED_HOSTS = None
 
 # Absolute filesystem path to the directory to host projects (with playbooks).
 # This directory should not be web-accessible.