diff --git a/common/python/nomadcore/nomad_query.py b/common/python/nomadcore/nomad_query.py
index 40fb7f79b1b2866aeb71fcc336ff931e3245b7a0..6c72a367e98082038f131daa909e62a6e9e5187b 100644
--- a/common/python/nomadcore/nomad_query.py
+++ b/common/python/nomadcore/nomad_query.py
@@ -145,7 +145,7 @@ class NomadQuery(object):
     __version__ = 1.0
 
     # Nomad API endpoint
-    endpoint = 'https://analytics-toolkit.nomad-coe.eu/api/'
+    endpoint = os.environ.get('NOMAD_BASE_URI','https://analytics-toolkit.nomad-coe.eu') + '/api/'
 
     # Private user path
     user_path = '/data/private'