diff --git a/resources/ts/store/messages.ts b/resources/ts/store/messages.ts
index 0812424..0c3e780 100644
--- a/resources/ts/store/messages.ts
+++ b/resources/ts/store/messages.ts
@@ -45,16 +45,13 @@ export const messages: Module<MessagesState, RootState> = {
             }
 
             const messages = await response.json() as Jsonified<Message>[];
-            commit('update', messages.map(m => {
-                const message = m as Message;
-
-                message.validFrom = moment(m.validFrom);
-                message.validTo   = moment(m.validTo);
-
-                return message;
-            }));
+            commit('update', messages.map(m => ({
+                ...m,
+                validFrom: moment(m.validFrom),
+                validTo:   moment(m.validTo),
+            })));
         }
     }
 };
 
-export default messages;
\ No newline at end of file
+export default messages;