diff --git a/src/main.py b/src/main.py
index fa86a43d..31178900 100644
--- a/src/main.py
+++ b/src/main.py
@@ -33,10 +33,12 @@
 config['ONTOLOGY_API_BASE_URL'] = app.config['ONTOLOGY_API_BASE_URL'].strip('/')
 config['DEBUG_MODE'] = app.config['DEBUG_MODE']
 config['JOB_QUEUE_MODE'] = app.config['JOB_QUEUE_MODE']
-config['REDIS_HOST'] = app.config['REDIS_HOST']
-config['REDIS_PORT'] = app.config['REDIS_PORT']
-config['REDIS_DB'] = app.config['REDIS_DB']
-config['REDIS_PASSWORD'] = app.config['REDIS_PASSWORD']
+if config.get('JOB_QUEUE_MODE') == True:
+    config['REDIS_HOST'] = app.config.get('REDIS_HOST')
+    config['REDIS_PORT'] = app.config.get('REDIS_PORT')
+    config['REDIS_DB'] = app.config.get('REDIS_DB')
+    config['REDIS_PASSWORD'] = app.config.get('REDIS_PASSWORD')
+
 
 if not config['ONTOLOGY_API_BASE_URL']:
     raise Exception(f"Unable retrieve ontology information using"
diff --git a/src/search-adaptor b/src/search-adaptor
index eca2c5f5..89a0af68 160000
--- a/src/search-adaptor
+++ b/src/search-adaptor
@@ -1 +1 @@
-Subproject commit eca2c5f50c7789ee899ff1b821bb84c2d10f316e
+Subproject commit 89a0af684aed0c6745010ecbce8066b830a5e8fc