diff --git a/src/systemd/dhclient@.service b/src/systemd/dhclient@.service
index 2ced1038a..5cc7869cb 100644
--- a/src/systemd/dhclient@.service
+++ b/src/systemd/dhclient@.service
@@ -1,18 +1,21 @@
 [Unit]
 Description=DHCP client on %i
 Documentation=man:dhclient(8)
 ConditionPathExists=/var/lib/dhcp/dhclient_%i.conf
 ConditionPathExists=/var/lib/dhcp/dhclient_%i.options
 After=vyos-router.service
 
 [Service]
 WorkingDirectory=/var/lib/dhcp
 Type=exec
 EnvironmentFile=-/var/lib/dhcp/dhclient_%i.options
 PIDFile=/var/lib/dhcp/dhclient_%i.pid
 ExecStart=/sbin/dhclient -4 $DHCLIENT_OPTS
 ExecStop=/sbin/dhclient -4 $DHCLIENT_OPTS -r
 Restart=always
+TimeoutStopSec=20
+SendSIGKILL=SIGKILL
+FinalKillSignal=SIGABRT
 
 [Install]
 WantedBy=multi-user.target