diff --git a/client/src/components/toggle-menu/ToggleSolutionsForModule.vue b/client/src/components/toggle-menu/ToggleSolutionsForModule.vue
index 6c9b466e..900a3939 100644
--- a/client/src/components/toggle-menu/ToggleSolutionsForModule.vue
+++ b/client/src/components/toggle-menu/ToggleSolutionsForModule.vue
@@ -1,6 +1,6 @@
 <template>
   <checkbox
-    :checked="enabled"
+    :checked="module.solutionsEnabled"
     label="Lösungen für Lernende anzeigen"
     v-if="canToggleSolutions"
     @input="toggleSolutions"/>
@@ -11,17 +11,16 @@
   import UPDATE_SOLUTION_VISIBILITY_MUTATION from '@/graphql/gql/mutations/updateSolutionVisibility.gql';
   import MODULE_FRAGMENT from '@/graphql/gql/fragments/moduleParts.gql';
 
-  import {meQuery} from '@/graphql/queries';
+  import {meQuery, moduleQuery} from '@/graphql/queries';
 
   export default {
-    props: ['slug', 'enabled'],
-
     components: {
       Checkbox
     },
 
     apollo: {
-      me: meQuery
+      me: meQuery,
+      module: moduleQuery
     },
 
     data() {
@@ -29,12 +28,16 @@
         me: {
           permissions: []
         },
+        module: {}
       };
     },
 
     computed: {
       canToggleSolutions() {
         return this.me.permissions.includes('users.can_manage_school_class_content');
+      },
+      slug() {
+        return this.$route.params.slug;
       }
     },
 
diff --git a/client/src/graphql/queries.js b/client/src/graphql/queries.js
index 2f3515b4..abcecc8b 100644
--- a/client/src/graphql/queries.js
+++ b/client/src/graphql/queries.js
@@ -7,8 +7,8 @@ export function moduleQuery() {
     variables: {
       slug: this.$route.params.slug
     },
-    update(data) {
-      return this.$getRidOfEdges(data).module || {};
+    update({module}) {
+      return this.$getRidOfEdges(module) || {};
     }
   };
 }
diff --git a/client/src/pages/module/moduleSettings.vue b/client/src/pages/module/moduleSettings.vue
index 4edb2264..d7734daf 100644
--- a/client/src/pages/module/moduleSettings.vue
+++ b/client/src/pages/module/moduleSettings.vue
@@ -4,7 +4,7 @@
     <section class="module-settings__section">
       <h2 class="module-settings__heading">Lösungen</h2>
       <p class="module-settings__paragraph">Wollen Sie die Lösungen in diesem Modul für Lernende anzeigen?</p>
-      <checkbox label="Lösungen anzeigen"/>
+      <toggle-solutions-for-module />
     </section>
     <section class="module-settings__section">
       <h2 class="module-settings__heading">Sichtbarkeit</h2>
@@ -24,9 +24,11 @@
 
 <script>
   import Checkbox from '@/components/ui/Checkbox';
+  import ToggleSolutionsForModule from '@/components/toggle-menu/ToggleSolutionsForModule';
 
   export default {
     components: {
+      ToggleSolutionsForModule,
       Checkbox
     }
   };
@@ -37,6 +39,5 @@
 
   .module-settings {
     @include settings-page;
-
   }
 </style>