diff --git a/resources/vue/components/AdminCourses.vue b/resources/vue/components/AdminCourses.vue
index 8e8c5c84ea76a0bac0f79dd473227e9efe840b9f..0f79cf7febf0ab9c7ff9378d3afbff238b9394ed 100644
--- a/resources/vue/components/AdminCourses.vue
+++ b/resources/vue/components/AdminCourses.vue
@@ -75,12 +75,12 @@
                 <td class="actions" v-html="course.action">
                 </td>
             </tr>
-            <tr v-if="sortedCourses.length === 0 && coursesCount <= 500 && displayLimitedLines && coursesLoaded">
+            <tr v-if="coursesCount === 0 && coursesLoaded">
                 <td :colspan="colspan">
                     {{ $gettext('Keine Ergebnisse') }}
                 </td>
             </tr>
-            <tr v-if="coursesCount > maxCourses && displayLimitedLines">
+            <tr v-if="coursesCount > 0 && sortedCourses.length === 0">
                 <td :colspan="colspan">
                     {{
                         $gettextInterpolate(
@@ -88,7 +88,7 @@
                             { n: coursesCount }
                         )
                     }}
-                    <a href="" @click.prevent="loadCourses({withoutLimit: true}); displayLimitedLines = false;">
+                    <a href="" @click.prevent="loadCourses({withoutLimit: true});">
                         {{ $gettext('Alle anzeigen') }}
                     </a>
                 </td>
@@ -130,7 +130,6 @@ export default {
                 direction: this.sortFlag,
             },
             currentLine: null,
-            displayLimitedLines: true,
             open_children: [],
         };
     },
diff --git a/resources/vue/store/AdminCoursesStore.js b/resources/vue/store/AdminCoursesStore.js
index e3df44ece1914c5dc680c460e90b576bad21757c..813644f143465701ab211704addfb0456f60afd5 100644
--- a/resources/vue/store/AdminCoursesStore.js
+++ b/resources/vue/store/AdminCoursesStore.js
@@ -44,9 +44,9 @@ export default {
                 state.courses.push(payload.data);
             }
         },
-        setCourses(state, courses, count = null) {
-            state.courses = courses;
-            state.coursesCount = count ?? courses.length;
+        setCourses(state, payload) {
+            state.courses = payload.courses;
+            state.coursesCount = payload.count ?? payload.courses.length;
         },
         setCoursesLoaded(state, loaded = true) {
             state.coursesLoaded = loaded;
@@ -109,9 +109,14 @@ export default {
                 commit('setCoursesLoaded');
 
                 if (response.data === undefined) {
-                    commit('setCourses', [], response.count);
+                    commit('setCourses', {
+                        courses: [],
+                        count: response.count
+                    });
                 } else {
-                    commit('setCourses', response.data);
+                    commit('setCourses', {
+                        courses: response.data
+                    });
                 }
 
                 commit('setButtons', {