diff --git a/src/core/hyprlock.cpp b/src/core/hyprlock.cpp
index 6c6ebed..b4bdf01 100644
--- a/src/core/hyprlock.cpp
+++ b/src/core/hyprlock.cpp
@@ -246,6 +246,10 @@ void CHyprlock::run() {
 
     wl_display_disconnect(m_sWaylandState.display);
 
+    // wait for threads to exit cleanly to avoid a coredump
+    pollThr.join();
+    timersThr.join();
+
     Debug::log(LOG, "Reached the end, exiting");
 }