diff --git a/application/views/mobile_first/ch-visa-free-tester.php b/application/views/mobile_first/ch-visa-free-tester.php
index c68a7d14..d9e48463 100644
--- a/application/views/mobile_first/ch-visa-free-tester.php
+++ b/application/views/mobile_first/ch-visa-free-tester.php
@@ -1078,9 +1078,14 @@ ready(el => {
     }
     if (departureDateVal === '')  {
       departure_date_errmsg.show();
-    }if (expiryDateVal === '')  {
+    }
+    if (expiryDateVal === '')  {
       expiry_date_errmsg.show();
     }
+    }
+    const disableTest = arrivalDateVal === '' || departureDateVal === '' || expiryDateVal === '';
+
+    if (disableTest) return;
 
     if (departFrom === leave4Country) {
       console.info('You must be in transit to a third country or region.');