diff --git a/web/client/reducers/__tests__/queryform-test.js b/web/client/reducers/__tests__/queryform-test.js
index f623ce64e2..0cb38b4eca 100644
--- a/web/client/reducers/__tests__/queryform-test.js
+++ b/web/client/reducers/__tests__/queryform-test.js
@@ -503,13 +503,17 @@ describe('Test the queryform reducer', () => {
         };
 
         const initialState = {
-            test: true
+            test: true,
+            spatialField: {
+                attribute: "GEOMETRY"
+            }
         };
 
         let state = queryform(initialState, testAction);
         expect(state).toExist();
 
         expect(state.test).toEqual(true);
+        expect(state.spatialField.attribute).toEqual("GEOMETRY");
     });
 
     it('Show Generated Filter', () => {
diff --git a/web/client/reducers/queryform.js b/web/client/reducers/queryform.js
index 0ca7caa072..76a8a35f82 100644
--- a/web/client/reducers/queryform.js
+++ b/web/client/reducers/queryform.js
@@ -193,13 +193,15 @@ function queryform(state = initialState, action) {
             return newState;
         }
         case REMOVE_SPATIAL_SELECT: {
-            return assign({}, state, {spatialField: assign({}, state.spatialField, initialState.spatialField)});
+            let spatialField = assign({}, initialState.spatialField, { attribute: state.spatialField.attribute });
+            return assign({}, state, {spatialField: assign({}, state.spatialField, spatialField)});
         }
         case SHOW_SPATIAL_DETAILS: {
             return assign({}, state, {showDetailsPanel: action.show});
         }
         case QUERY_FORM_RESET: {
-            return assign({}, state, initialState);
+            let spatialField = assign({}, initialState.spatialField, { attribute: state.spatialField.attribute });
+            return assign({}, state, initialState, {spatialField});
         }
         case SHOW_GENERATED_FILTER: {
             return assign({}, state, {showGeneratedFilter: action.data});