diff --git a/src/caosdb/connection/connection.py b/src/caosdb/connection/connection.py
index 4cd8bc774147e40e1ab5e13e9b44ef38ab747560..99cb743125b7644a495271b3787ea6bf26d125e8 100644
--- a/src/caosdb/connection/connection.py
+++ b/src/caosdb/connection/connection.py
@@ -143,6 +143,9 @@ class _DefaultCaosDBServerConnection(CaosDBServerConnection):
             headers = {}
         headers["User-Agent"] = self._useragent
 
+        if path.endswith("/."):
+            path = path[:-1] + "%2E"
+
         try:
             response = self._session.request(
                 method=method,
diff --git a/src/caosdb/connection/utils.py b/src/caosdb/connection/utils.py
index 6d0b7a8b382aa114e6e3327d8b8fea09a1727979..9056bf9dea14fa2fa441fa13a5efe8e776990284 100644
--- a/src/caosdb/connection/utils.py
+++ b/src/caosdb/connection/utils.py
@@ -102,16 +102,13 @@ def make_uri_path(segments=None, query=None):
     """
     path_no_query = ("/".join([quote(segment) for segment in segments])
                      if segments else "")
-    result = str(path_no_query if query is None else "?".join([
+    return str(path_no_query if query is None else "?".join([
         path_no_query, "&".join([
             quote(key) + "=" +
             (quote(query[key]) if query[key] is not None else "")
             for key in query
         ])
     ]))
-    if result.endswith("/."):
-        result = result[:-1] + "%2E"
-    return result
 
 
 def quote(string):