diff --git a/client/src/components/profile/ModuleActivity.vue b/client/src/components/profile/ModuleActivity.vue
index 4c0bf600..aecf4e31 100644
--- a/client/src/components/profile/ModuleActivity.vue
+++ b/client/src/components/profile/ModuleActivity.vue
@@ -23,7 +23,7 @@
         class="module-activity__entry"
         v-for="answer in answers"
         :key="answer.id"
-        @link="goTo('module', this.module.slug)"
+        @link="goTo('module', module.slug)"
       >
         {{ answer.survey.title }}
       </activity-entry>
diff --git a/client/src/components/ui/InfoMessage.vue b/client/src/components/ui/InfoMessage.vue
index 5a352163..5e0e0d01 100644
--- a/client/src/components/ui/InfoMessage.vue
+++ b/client/src/components/ui/InfoMessage.vue
@@ -9,7 +9,6 @@
 import InfoIcon from '@/components/icons/InfoIcon.vue';
 </script>
 
-
 <style scoped lang="scss">
 @import 'styles/helpers';
 
diff --git a/client/src/components/ui/loadingMessage.vue b/client/src/components/ui/loadingMessage.vue
index b00d984a..e02c9fa3 100644
--- a/client/src/components/ui/loadingMessage.vue
+++ b/client/src/components/ui/loadingMessage.vue
@@ -1,16 +1,17 @@
 <template>
   <div class="loading-message">
-    <loading-spinner class="loading-message__spinner" style="
-        --spinner-size: 40px; "/>
+    <loading-spinner
+      class="loading-message__spinner"
+      style="--spinner-size: 40px"
+    />
     <span class="loading-message__text"><slot></slot> </span>
   </div>
 </template>
 
 <script setup lang="ts">
-import LoadingSpinner from "@/components/ui/loadingSpinner.vue";
+import LoadingSpinner from '@/components/ui/loadingSpinner.vue';
 </script>
 
-
 <style scoped lang="scss">
 @import 'styles/helpers';
 
diff --git a/client/src/pages/activity.vue b/client/src/pages/activity.vue
index 4700cf8b..a2e2410d 100644
--- a/client/src/pages/activity.vue
+++ b/client/src/pages/activity.vue
@@ -5,6 +5,7 @@
       :filter="filter"
       @change-filter="filter = $event"
     />
+    <loading-message v-if="loading">Aktiviäten werden geladen</loading-message>
     <div class="modules">
       <module-activity
         :filter="filter"
@@ -28,9 +29,11 @@ import ModuleActivity from '@/components/profile/ModuleActivity.vue';
 import InstrumentActivity from '@/components/profile/InstrumentActivity.vue';
 import ActivityFilter from '@/components/profile/ActivityFilter.vue';
 import MY_ACTIVITY_QUERY from '@/graphql/gql/queries/myActivity.gql';
+import LoadingMessage from '@/components/ui/loadingMessage.vue';
 
 export default {
   components: {
+    LoadingMessage,
     ModuleActivity,
     InstrumentActivity,
     ActivityFilter,
@@ -40,6 +43,7 @@ export default {
     modules: {
       query: MY_ACTIVITY_QUERY,
       update(data) {
+        this.loading = false;
         return this.$getRidOfEdges(data).myActivity;
       },
       pollInterval: 15000,
@@ -47,6 +51,7 @@ export default {
     instruments: {
       query: MY_ACTIVITY_QUERY,
       update(data) {
+        this.loading = false;
         return this.$getRidOfEdges(data).myInstrumentActivity;
       },
       pollInterval: 15000,
@@ -58,6 +63,7 @@ export default {
       modules: [],
       instruments: [],
       filter: '',
+      loading: true,
     };
   },
 };