diff --git a/CHANGES.rst b/CHANGES.rst
index 6e2acd7b2ad40057b0ac595283e10f9bd4e77299..664e69b51ac46c2f01fce5867ebfca9bb794b79b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -9,6 +9,11 @@ Changes
 =======
 
 
+Version 2025.1.7 (released 2025-02-11)
+
+- Override `BROKER_URL` more aggressively
+
+
 Version 2025.1.6 (released 2025-02-11)
 
 - Remove accidentally added MXID field from notification settings template
diff --git a/invenio_config_tuw/__init__.py b/invenio_config_tuw/__init__.py
index c4a33e0d4c26bb4ccf0ecd9ce175e57e4df9b360..a888db7d8be5e270a1ec632221cad4b3301d9d4c 100644
--- a/invenio_config_tuw/__init__.py
+++ b/invenio_config_tuw/__init__.py
@@ -9,6 +9,6 @@
 
 from .ext import InvenioConfigTUW
 
-__version__ = "2025.1.6"
+__version__ = "2025.1.7"
 
 __all__ = ("__version__", "InvenioConfigTUW")
diff --git a/invenio_config_tuw/startup/config.py b/invenio_config_tuw/startup/config.py
index 3f90323739ae2fdd5c112fa98946fbcb51e3bf6f..84271b9f85278628c61a0bf776c50aac8e2b3368 100644
--- a/invenio_config_tuw/startup/config.py
+++ b/invenio_config_tuw/startup/config.py
@@ -116,12 +116,11 @@ def assemble_broker_uri_from_parts(app):
     broker_user = _get_config(app, "BROKER_USER", default=rabbitmq_user)
     broker_password = _get_config(app, "BROKER_PASSWORD", default=rabbitmq_password)
 
-    if broker_url is None:
-        if None not in [broker_protocol, broker_user, broker_password, broker_host]:
-            broker_url = (
-                f"{broker_protocol}://{broker_user}:{broker_password}@{broker_host}/"
-            )
-    else:
+    if None not in [broker_protocol, broker_user, broker_password, broker_host]:
+        broker_url = (
+            f"{broker_protocol}://{broker_user}:{broker_password}@{broker_host}/"
+        )
+    elif broker_url is None:
         broker_url = "amqp://guest:guest@localhost:5672/"
 
     # celery doesn't like having BROKER_HOST *and* the other values set