diff --git a/resources/vue/courseware-index-app.js b/resources/vue/courseware-index-app.js
index 1b87c8b31c5d33f7a1967f35ef3feb9041db1737..0cd567e0ef7f185464690deffa85348356528ebe 100755
--- a/resources/vue/courseware-index-app.js
+++ b/resources/vue/courseware-index-app.js
@@ -67,11 +67,13 @@ const mountApp = (STUDIP, createApp, element) => {
         },
     ];
 
-    const base = STUDIP.URLHelper.parameters.cid
-        ? STUDIP.URLHelper.getURL('dispatch.php/course/courseware', { cid: STUDIP.URLHelper.parameters.cid }, true)
-        : STUDIP.URLHelper.getURL('dispatch.php/contents/courseware/courseware');
+    const base = new URL(
+        STUDIP.URLHelper.parameters.cid
+            ? STUDIP.URLHelper.getURL('dispatch.php/course/courseware', { cid: STUDIP.URLHelper.parameters.cid }, true)
+            : STUDIP.URLHelper.getURL('dispatch.php/contents/courseware/courseware')
+    );
     const router = new VueRouter({
-        base,
+        base: `${base.pathname}${base.search}&`,
         routes,
     });