diff --git a/handlers/main.yml b/handlers/main.yml
index 9569029..41725c0 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Restart Wireguard service
   systemd:
-    name: "wg-quick@{{ interface_name }}"
+    name: "wg-quick@{{ interface_name }} && ping -c 3 -4 {{ server_address }}"
     state: restarted
     enabled: yes
     daemon_reload: yes
diff --git a/tasks/configure.yml b/tasks/configure.yml
index 430e69a..bc6c530 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -94,8 +94,3 @@
   delegate_to: "{{ groups['wireguard_server'][0] }}"
   notify:
     - Restart Wireguard service
-
-- name: Ping VPN server for monitoring
-  shell: "ping -c 3 -4 {{ server_address }}"
-  register: ping_result
-  ignore_errors: true