diff --git a/client/src/components/content-blocks/assignment/SubmissionForm.vue b/client/src/components/content-blocks/assignment/SubmissionForm.vue
index b2b42d0e..ab98f973 100644
--- a/client/src/components/content-blocks/assignment/SubmissionForm.vue
+++ b/client/src/components/content-blocks/assignment/SubmissionForm.vue
@@ -6,9 +6,13 @@
         :value="submission.text"
         @input="$emit('input', $event.target.value)"
       ></textarea>
-    <div class="submission-form__save-status">
+    <div class="submission-form__save-status submission-form__save-status--saved" v-if="saved">
       <tick-circle-icon class="submission-form__save-status-icon"></tick-circle-icon>
-      <span class="submission-form__save-status-text">Alle Änderungen gespeichert {{saved}}</span>
+      <span class="submission-form__save-status-text">Alle Änderungen gespeichert</span>
+    </div>
+    <div class="submission-form__save-status submission-form__save-status--unsaved" v-if="!saved">
+      <tick-circle-icon class="submission-form__save-status-icon submission-form__saving-icon"></tick-circle-icon>
+      <span class="submission-form__save-status-text">Änderungen werden gespeichert</span>
     </div>
   </div>
 </template>
@@ -68,5 +72,15 @@
       font-size: toRem(14px);
       color: $color-grey;
     }
+
+    @keyframes spin {
+      100% {
+        transform: rotate(-360deg);
+      }
+    }
+
+    &__saving-icon {
+      animation: spin 2.5s linear infinite;
+    }
   }
 </style>