diff --git a/UI/src/components/features/RipaFormContainer.vue b/UI/src/components/features/RipaFormContainer.vue
index af2a35e4..b003dd62 100644
--- a/UI/src/components/features/RipaFormContainer.vue
+++ b/UI/src/components/features/RipaFormContainer.vue
@@ -305,7 +305,8 @@ export default {
     },
 
     isLastLocationValid() {
-      return this.getLastLocation !== null
+      const lastLocation = this.getLastLocation()
+      return lastLocation !== null
     },
 
     getFavoriteLocations() {
diff --git a/UI/src/components/molecules/RipaLocation.vue b/UI/src/components/molecules/RipaLocation.vue
index ce8ece9b..1558a63e 100644
--- a/UI/src/components/molecules/RipaLocation.vue
+++ b/UI/src/components/molecules/RipaLocation.vue
@@ -441,7 +441,7 @@ export default {
     },
 
     blockNumberRulesV2() {
-      const blockNumber = this.model.location.blockNumber
+      const blockNumber = this.model.location.blockNumber || ''
 
       return [
         this.isLocationOptionsFilledV2 ||