diff --git a/ansible/roles/signage_display/templates/morz-kiosk.service.j2 b/ansible/roles/signage_display/templates/morz-kiosk.service.j2
index 9ed4187..1a69668 100644
--- a/ansible/roles/signage_display/templates/morz-kiosk.service.j2
+++ b/ansible/roles/signage_display/templates/morz-kiosk.service.j2
@@ -15,6 +15,8 @@ UtmpMode=user
 Environment=HOME=/home/{{ signage_user }}
 ExecStartPre=/bin/sleep 3
 ExecStart=/usr/bin/startx /usr/local/bin/morz-kiosk -- :0 vt1 -nocursor
+ExecStop=/usr/bin/pkill -u {{ signage_user }} chromium
+TimeoutStopSec=10
 Restart=on-failure
 RestartSec=10