diff --git a/client/src/components/ContentBlock.vue b/client/src/components/ContentBlock.vue
index 85f18fbb..659939a7 100644
--- a/client/src/components/ContentBlock.vue
+++ b/client/src/components/ContentBlock.vue
@@ -134,7 +134,6 @@ import {
   SelectionHandlerType,
 } from '@/helpers/highlight';
 import { graphql } from '@/__generated__';
-import log from 'loglevel';
 import highlightSidebar from '@/helpers/highlight-sidebar';
 import { doUpdateHighlight } from '@/graphql/mutations';
 import { AddContentHighlightArgument } from '@/__generated__/graphql';
@@ -315,8 +314,6 @@ const createHighlight = createHighlightCurry({
 
 const isNested = computed(() => props.contentBlock.root); // if it's nested, a the parent has the root propert
 onMounted(() => {
-  log.debug('onMounted ContentBlock called');
-
   const element = contentBlockDiv.value;
 
   if (element !== null) {
diff --git a/client/src/components/content-blocks/assignment/Assignment.vue b/client/src/components/content-blocks/assignment/Assignment.vue
index 0b6d4208..d60bcdcf 100644
--- a/client/src/components/content-blocks/assignment/Assignment.vue
+++ b/client/src/components/content-blocks/assignment/Assignment.vue
@@ -42,10 +42,11 @@
 
       <p
         class="assignment__feedback"
-        v-if="assignment.submission.submissionFeedback"
+        v-if="assignment.submission?.submissionFeedback"
         v-html="feedbackText"
       />
     </template>
+
     <template v-if="!isStudent && assignment.id">
       <router-link
         :to="{ name: 'submissions', params: { id: assignment.id } }"
@@ -264,9 +265,12 @@ const unmark = () => {
 
 onResult(async () => {
   const { assignment: loadedAssignment } = result.value;
+
   assignment.value = {
     ...loadedAssignment,
   };
+  await nextTick();
+
   assignment.value.submission = Object.assign(initialSubmission, assignment.value.submission);
 
   if (assignmentDiv.value) {
@@ -392,9 +396,9 @@ const saveInput = (answer: string) => {
   corrections.value = '';
   unsaved.value = true;
   /*
-    We update the assignment on this component, so the changes are reflected on it. The server does not return
-    the updated entity, to prevent the UI to update when the user is entering his input
-   */
+        We update the assignment on this component, so the changes are reflected on it. The server does not return
+        the updated entity, to prevent the UI to update when the user is entering his input
+       */
   assignment.value.submission.text = answer;
   _save(assignment.value.submission);
 
diff --git a/client/src/graphql/cache.ts b/client/src/graphql/cache.ts
index 6acec8eb..58220c53 100644
--- a/client/src/graphql/cache.ts
+++ b/client/src/graphql/cache.ts
@@ -1,6 +1,5 @@
 import { ContentBlockNode, HighlightNode } from '@/__generated__/graphql';
 import { makeVar, InMemoryCache } from '@apollo/client/core';
-import log from 'loglevel';
 
 const showNavigationSidebarVar = makeVar(false);
 const showProfileSidebarVar = makeVar(false);
@@ -12,7 +11,7 @@ const languageVar = makeVar('de');
 const idToRefFactory =
   (__typename: string) =>
   (_, { args, toReference }) => {
-    log.debug(`Referencing ${__typename} with ${args.id}`);
+    //log.debug(`Referencing ${__typename} with ${args.id}`);
     return toReference({
       __typename,
       id: args.id,