diff --git a/res/miracle-dispd.service.cmake b/res/miracle-dispd.service.cmake
index 58ac8e4..4c2927e 100644
--- a/res/miracle-dispd.service.cmake
+++ b/res/miracle-dispd.service.cmake
@@ -8,6 +8,7 @@ After=miracle-wifid.service
 BusName=org.freedesktop.miracle.wfd
 Environment=LOG_LEVEL=trace
 ExecStart=@CMAKE_INSTALL_PREFIX@/bin/miracle-dispd
+KillSignal=SIGKILL
 
 [Install]
 WantedBy=multi-user.target
diff --git a/src/disp/dispd.c b/src/disp/dispd.c
index b8affd8..1eb8e1a 100644
--- a/src/disp/dispd.c
+++ b/src/disp/dispd.c
@@ -513,6 +513,11 @@ int main(int argc, char **argv)
 		goto unref_loop;
 	}
 
+	r = sd_event_set_watchdog(event, true);
+	if (0 > r) {
+		goto unref_event;
+	}
+
 	source = sd_source_new(event);
 	if(!source) {
 		r = -ENOMEM;