diff --git a/client/src/components/AssignmentWithSubmissions.vue b/client/src/components/AssignmentWithSubmissions.vue
index 02cdcc96..9381c655 100644
--- a/client/src/components/AssignmentWithSubmissions.vue
+++ b/client/src/components/AssignmentWithSubmissions.vue
@@ -25,6 +25,8 @@
 <script>
   import StudentSubmission from '@/components/StudentSubmission';
 
+  import {meQuery} from '@/graphql/queries';
+
   export default {
     props: ['assignment'],
 
@@ -37,10 +39,10 @@
         return `/submission/${submission.id}`
       },
       belongsToSchool(submission) {
-        if (this.currentFilter === '') {
+        if (this.currentFilter.id === '') {
           return true;
         }
-        return submission.student.schoolClasses.edges.some(edge => edge.node.id === this.currentFilter)
+        return submission.student.schoolClasses.edges.some(edge => edge.node.id === this.currentFilter.id)
       }
     },
 
@@ -51,10 +53,20 @@
         });
       },
       currentFilter() {
-        return this.$store.state.filterForSchoolClass;
+        return this.me.selectedClass;
       },
     },
 
+    data() {
+      return {
+        me: {}
+      }
+    },
+
+    apollo: {
+      me: meQuery
+    }
+
   }
 </script>