diff --git a/client/src/components/AssignmentWithSubmissions.vue b/client/src/components/AssignmentWithSubmissions.vue
index b5fe93da..eae6a9a7 100644
--- a/client/src/components/AssignmentWithSubmissions.vue
+++ b/client/src/components/AssignmentWithSubmissions.vue
@@ -1,6 +1,10 @@
 <template>
   <div class="assignment-with-submissions">
     <h1 class="assignment-with-submissions__title">{{assignment.title}}</h1>
+    <div class="assignment-with-submissions__solution" v-if="assignment.solution">
+      <h4 class="assignment-with-submissions__solution-title">Lösung</h4>
+      <p class="assignment-with-submissions__solution-text">{{assignment.solution}}</p>
+    </div>
     <p v-if="!assignment.submissions.length">Zu diesem Auftrag sind noch keine Ergebnisse vorhanden</p>
     <router-link
       :to="submissionLink(submission)"
@@ -60,6 +64,16 @@
       font-size: toRem(35px);
     }
 
+    &__solution {
+      margin-bottom: 1rem;
+    }
+
+    &__solution-title {
+      font-size: toRem(17px);
+      font-weight: 800;
+      margin-bottom: 1rem;
+    }
+
     &__link {
       display: block;
       &:first-of-type {
diff --git a/client/src/graphql/gql/assignmentWithSubmissionsQuery.gql b/client/src/graphql/gql/assignmentWithSubmissionsQuery.gql
index 4cc06544..f2095c4e 100644
--- a/client/src/graphql/gql/assignmentWithSubmissionsQuery.gql
+++ b/client/src/graphql/gql/assignmentWithSubmissionsQuery.gql
@@ -2,6 +2,7 @@
 query AssignmentWithSubmissions($id: ID!) {
   assignment(id: $id) {
     title
+    solution
     submissions {
       id
       text