diff --git a/modules/client/front/fiscal-data/index.js b/modules/client/front/fiscal-data/index.js
index ec918fc66..7fdb03dda 100644
--- a/modules/client/front/fiscal-data/index.js
+++ b/modules/client/front/fiscal-data/index.js
@@ -100,7 +100,7 @@ export default class Controller extends Component {
         const oldValue = this._province;
         this._province = selection;
 
-        if (!oldValue) return;
+        if (!selection || !oldValue) return;
 
         const country = selection.country;
 
@@ -116,7 +116,7 @@ export default class Controller extends Component {
         const oldValue = this._town;
         this._town = selection;
 
-        if (!oldValue) return;
+        if (!selection || !oldValue) return;
 
         const province = selection.province;
         const country = province.country;
@@ -138,7 +138,7 @@ export default class Controller extends Component {
         const oldValue = this._postcode;
         this._postcode = selection;
 
-        if (!oldValue) return;
+        if (!selection || !oldValue) return;
 
         const town = selection.town;
         const province = town.province;