diff --git a/awx/main/dispatch/__init__.py b/awx/main/dispatch/__init__.py
index 5a6606ebdcbc..bc65542e3a56 100644
--- a/awx/main/dispatch/__init__.py
+++ b/awx/main/dispatch/__init__.py
@@ -102,7 +102,8 @@ def create_listener_connection():
 
     # Apply overrides specifically for the listener connection
     for k, v in settings.LISTENER_DATABASES.get('default', {}).items():
-        conf[k] = v
+        if k != 'OPTIONS':
+            conf[k] = v
     for k, v in settings.LISTENER_DATABASES.get('default', {}).get('OPTIONS', {}).items():
         conf['OPTIONS'][k] = v
 
diff --git a/awx/main/wsrelay.py b/awx/main/wsrelay.py
index bedf68efb030..dced6c4e837e 100644
--- a/awx/main/wsrelay.py
+++ b/awx/main/wsrelay.py
@@ -306,7 +306,8 @@ async def run(self):
         database_conf['OPTIONS'] = deepcopy(database_conf.get('OPTIONS', {}))
 
         for k, v in settings.LISTENER_DATABASES.get('default', {}).items():
-            database_conf[k] = v
+            if k != 'OPTIONS':
+                database_conf[k] = v
         for k, v in settings.LISTENER_DATABASES.get('default', {}).get('OPTIONS', {}).items():
             database_conf['OPTIONS'][k] = v