diff --git a/src/common/resources/entity/state.js b/src/common/resources/entity/state.js
index 0b8c976..cd9c521 100644
--- a/src/common/resources/entity/state.js
+++ b/src/common/resources/entity/state.js
@@ -18,8 +18,8 @@ const mergeEntityWithDefaults = (entity) => {
       const {params, state} = trait;
       const Trait = lookupTrait(type);
       draft.traits[type] = {
-        params: Trait ? {...Trait.defaultParams(), ...params} : params,
-        state: Trait ? {...Trait.defaultState(), ...state} : state,
+        params: Trait ? Trait.defaultParamsWith(params) : params,
+        state: Trait ? Trait.defaultStateWith(state) : state,
       };
     });
   });