diff --git a/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/rdf4j/aas/AasClient.java b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/rdf4j/aas/AasClient.java
index 04e6bcac..9dc53615 100644
--- a/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/rdf4j/aas/AasClient.java
+++ b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/rdf4j/aas/AasClient.java
@@ -56,7 +56,9 @@ public IExtendedIterator<Record> submodel(String id, boolean encodeBase64) throw
 	protected IExtendedIterator<Record> query(String endpoint, String path, Map<String, String> params, String cursor)
 			throws URISyntaxException, IOException {
 		URIBuilder uriBuilder = new URIBuilder(endpoint);
-		uriBuilder.setPath(path);
+		uriBuilder.setPath(Optional.ofNullable(uriBuilder.getPath())
+				.map(p -> p.replaceFirst("/?$", "/"))
+				.orElse("") + path);
 		if (params != null) {
 			params.forEach((k, v) -> uriBuilder.setParameter(k, v));
 		}