diff --git a/src/core/gcal-calendar-monitor.c b/src/core/gcal-calendar-monitor.c
index 87172e78..8055eead 100644
--- a/src/core/gcal-calendar-monitor.c
+++ b/src/core/gcal-calendar-monitor.c
@@ -996,7 +996,7 @@ gcal_calendar_monitor_finalize (GObject *object)
 
   g_cancellable_cancel (self->cancellable);
   notify_view_thread (self, QUIT);
-  g_thread_join (self->thread);
+  g_clear_pointer (&self->thread, g_thread_join);
 
   remove_all_events (self);