diff --git a/Changes b/Changes
index 000f317..29893dc 100644
--- a/Changes
+++ b/Changes
@@ -6,6 +6,7 @@
 - Make large context group optional and disabled by default [AI-assisted]
 - Add tests for large context group config [AI-assisted]
 - Make rate-limit optional and enabled by default [AI-assisted]
+- Improve APIVersionFilter to avoid IndexOutOfBoundsException on empty path segments [AI assisted]
 
 # version 1.2-SNAPSHOT
 
diff --git a/src/main/java/de/ids_mannheim/korap/web/filter/APIVersionFilter.java b/src/main/java/de/ids_mannheim/korap/web/filter/APIVersionFilter.java
index e42de93..0635517 100644
--- a/src/main/java/de/ids_mannheim/korap/web/filter/APIVersionFilter.java
+++ b/src/main/java/de/ids_mannheim/korap/web/filter/APIVersionFilter.java
@@ -27,6 +27,9 @@
 
     public void filter (ContainerRequestContext request) {
         List<PathSegment> pathSegments = request.getUriInfo().getPathSegments();
+        if (pathSegments.isEmpty()) {
+            throw new NotFoundException();
+        }
         String version = pathSegments.get(0).getPath();
 
         if (!config.getSupportedVersions().contains(version)) {