diff --git a/client/src/components/content-block-form/ContentElement.vue b/client/src/components/content-block-form/ContentElement.vue
index 86868bff..4d5f049d 100644
--- a/client/src/components/content-block-form/ContentElement.vue
+++ b/client/src/components/content-block-form/ContentElement.vue
@@ -57,6 +57,7 @@
   const TextForm = () => import(/* webpackChunkName: "content-forms" */'@/components/content-forms/TipTap.vue');
   const SubtitleForm = () => import(/* webpackChunkName: "content-forms" */'@/components/content-forms/SubtitleForm');
   // readonly blocks
+  const Assignment = () => import(/* webpackChunkName: "content-forms" */'@/components/content-blocks/assignment/Assignment');
   const SurveyBlock = () => import(/* webpackChunkName: "content-forms" */'@/components/content-blocks/SurveyBlock');
   const Solution = () => import(/* webpackChunkName: "content-forms" */'@/components/content-blocks/Solution');
   const ImageBlock = () => import(/* webpackChunkName: "content-forms" */'@/components/content-blocks/ImageBlock');
@@ -108,7 +109,8 @@
       ModuleRoomSlug,
       CmsDocumentBlock,
       InfogramBlock,
-      ThinglinkBlock
+      ThinglinkBlock,
+      Assignment
     },
 
     computed: {
@@ -171,7 +173,7 @@
             };
           case 'assignment':
             return {
-              component: 'assignment-form',
+              component: element.id ? 'assignment' : 'assignment-form', // prevent editing of existing assignments
               title: 'Aufgabe & Ergebnis',
               icon: 'speech-bubble-icon',
             };