diff --git a/stores/index.js b/stores/index.js
index f886725..1e18760 100644
--- a/stores/index.js
+++ b/stores/index.js
@@ -11,12 +11,11 @@ export function initializeStore(initialData) {
   if (initialData) {
     const {
       user = null,
-      calculationValues = {},
-      calculationStatuses = {},
+      calculation: { values = {}, statuses = {} },
     } = initialData;
     _store.$user.hydrate(user);
-    _store.$calculation.$values.hydrate(calculationValues);
-    _store.$calculation.$status.hydrate(calculationStatuses);
+    _store.$calculation.$values.hydrate(values);
+    _store.$calculation.$status.hydrate(statuses);
   }
 
   if (typeof window === 'undefined') return _store;