diff --git a/src/client/components/forms/Form/reducer.js b/src/client/components/forms/Form/reducer.js
index 2e5d7cf29d..7cd35538c3 100644
--- a/src/client/components/forms/Form/reducer.js
+++ b/src/client/components/forms/Form/reducer.js
@@ -48,9 +48,11 @@ function fieldReducer(state, action) {
 
       rowsFromState.splice(rowIndex, 1);
 
+      const flattenedRowState = rowsFromState.length > 0 ? flatten({ [name]: rowsFromState }, { filters: flattenFilters }) : {};
+
       return {
         ...remainingState,
-        ...(flatten({ [name]: rowsFromState }, { filters: flattenFilters })),
+        ...flattenedRowState,
       };
     }