diff --git a/common/utils/index.js b/common/utils/index.js
index 0456c3bbbe4..85f49c563f9 100644
--- a/common/utils/index.js
+++ b/common/utils/index.js
@@ -4,10 +4,13 @@ export function nameSpacedTransformer(ns, transformer) {
   }
   return (state) => {
     const newState = transformer(state[ns]);
+
     // nothing has changed
-    if (newState === state[ns]) {
-      return state;
+    // noop
+    if (!newState || newState === state[ns]) {
+      return null;
     }
+
     return { ...state, [ns]: newState };
   };
 }