diff --git a/client/cypress/integration/frontend/assignment.spec.js b/client/cypress/integration/frontend/assignment.spec.js
new file mode 100644
index 00000000..c17375f4
--- /dev/null
+++ b/client/cypress/integration/frontend/assignment.spec.js
@@ -0,0 +1,36 @@
+const operations = {
+  ModulesQuery: {},
+  AssignmentWithSubmissions: {
+    assignment: {
+      title: 'Ein Auftragstitel',
+      solution: '<p>Eine Lösung</p>',
+      assignment: 'Ein Auftrag',
+      submissions: []
+    }
+  },
+  MeQuery: {
+    me: {
+      onboardingVisited: true
+    },
+  },
+};
+
+describe('Assignments', () => {
+  before(() => {
+    cy.task('getSchema').then(schema => {
+      cy.mockGraphql({
+        schema,
+        mocks: {},
+        operations,
+      });
+    });
+  });
+
+  it('it does not display HTML tags', () => {
+    cy.server();
+    cy.viewport('macbook-15');
+    cy.fakeLogin('nico.zickgraf', 'test');
+    cy.visit('/module/lohn-und-budget/submissions/QXNzaWdubWVudE5vZGU6MQ==');
+    cy.getByDataCy('assignment-solution').should('have.text', 'Eine Lösung');
+  });
+});
diff --git a/client/src/components/AssignmentWithSubmissions.vue b/client/src/components/AssignmentWithSubmissions.vue
index 9198ddf0..5adafff0 100644
--- a/client/src/components/AssignmentWithSubmissions.vue
+++ b/client/src/components/AssignmentWithSubmissions.vue
@@ -12,7 +12,10 @@
       class="assignment-with-submissions__solution"
       v-if="assignment.solution">
       <h4 class="assignment-with-submissions__heading">Lösung</h4>
-      <p class="assignment-with-submissions__solution-text">{{ assignment.solution }}</p>
+      <p
+        class="assignment-with-submissions__solution-text"
+        data-cy="assignment-solution"
+        v-html="assignment.solution" />
     </div>
     <p
       class="assignment-with-submissions__no-submissions"