diff --git a/src/utils/other.py b/src/utils/other.py
index c6cb337..c7086be 100644
--- a/src/utils/other.py
+++ b/src/utils/other.py
@@ -22,14 +22,14 @@ def get_project_data_source(keycloak_token, project_id, hub_adapter_service_name
     return asyncio.run(call_sources(client, project_id))
 
 
-def get_element_by_substring(data: list[str], substring: str) -> str:
+def get_element_by_substring(data: list[str], substring: str) -> str:  # TODO: Better solution for this
     """
     Get the smallest element in a list that contains a substring
     :param data:
     :param substring:
     :return:
     """
-    matching_elements = [element for element in data if substring in element]
+    matching_elements = [element for element in data if (substring in element) and ('-db-' not in element)]  # TODO: '-db-'- hack for messagebroker
     return min(matching_elements, key=len) if matching_elements else None