diff --git a/src/seat.c b/src/seat.c
index 92603a1f..e4215882 100644
--- a/src/seat.c
+++ b/src/seat.c
@@ -583,6 +583,11 @@ seat_finish(struct server *server)
 		input_device_destroy(&input->destroy, NULL);
 	}
 
+	if (seat->workspace_osd_timer) {
+		wl_event_source_remove(seat->workspace_osd_timer);
+		seat->workspace_osd_timer = NULL;
+	}
+
 	input_handlers_finish(seat);
 	input_method_relay_finish(seat->input_method_relay);
 }