diff --git a/client/src/pages/rooms/newRoomEntry.vue b/client/src/pages/rooms/newRoomEntry.vue
index 99cfe57f..b8ff8abe 100644
--- a/client/src/pages/rooms/newRoomEntry.vue
+++ b/client/src/pages/rooms/newRoomEntry.vue
@@ -59,10 +59,12 @@ export default defineComponent({
     },
     save({ title, contents }) {
       const entry = {
-        title,
-        contents,
-        roomSlug: this.slug,
-        schoolClass: this.isModule ? this.me.selectedClass.id : null,
+        ...{
+          title,
+          contents,
+          roomSlug: this.slug,
+        },
+        ...(this.isModule && { schoolClass: this.me.selectedClass.id }),
       };
       const mutation = this.isModule ? NEW_MODULE_ROOM_ENTRY_MUTATION : NEW_ROOM_ENTRY_MUTATION;
       this.$apollo
@@ -75,7 +77,7 @@ export default defineComponent({
           },
           update: (store, { data }) => {
             try {
-              const { roomEntry } = this.isModule ? data.addRoomEntry : data.addModuleRoomEntry;
+              const { roomEntry } = this.isModule ? data.addModuleRoomEntry : data.addRoomEntry;
               const query = ROOM_ENTRIES_QUERY;
               const variables = { slug: this.slug };
               const { room } = store.readQuery({ query, variables });