diff --git a/conf/ynh-vpnclient-checker.sh b/conf/ynh-vpnclient-checker.sh
index c5b5dde..7c86632 100644
--- a/conf/ynh-vpnclient-checker.sh
+++ b/conf/ynh-vpnclient-checker.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [ ! -e /tmp/.ynh-vpnclient-stopped ] && ! ip link show tun0 &> /dev/null; then
+if [ ! -e /tmp/.ynh-vpnclient-stopped ] && ! ip route get 1.2.3.4 | grep -q tun0; then
   systemctl restart ynh-vpnclient &> /dev/null
 fi
 
diff --git a/sources/controller.php b/sources/controller.php
index e399c37..a27b900 100644
--- a/sources/controller.php
+++ b/sources/controller.php
@@ -36,8 +36,8 @@ function stop_service() {
 }
 
 function start_service() {
-  unlink('/tmp/.ynh-vpnclient-stopped');
   exec('sudo systemctl start ynh-vpnclient', $output, $retcode);
+  unlink('/tmp/.ynh-vpnclient-stopped');
 
   return $retcode;
 }