diff --git a/types/tablet_v2/wlr_tablet_v2_tool.c b/types/tablet_v2/wlr_tablet_v2_tool.c
index 8574a9a2f..e73aa767b 100644
--- a/types/tablet_v2/wlr_tablet_v2_tool.c
+++ b/types/tablet_v2/wlr_tablet_v2_tool.c
@@ -103,7 +103,10 @@ void destroy_tablet_tool_v2(struct wl_resource *resource) {
 	}
 
 	if (client->tool && client->tool->current_client == client) {
+		wl_list_remove(&client->tool->surface_destroy.link);
+		wl_list_init(&client->tool->surface_destroy.link);
 		client->tool->current_client = NULL;
+		client->tool->focused_surface = NULL;
 	}
 
 	wl_list_remove(&client->seat_link);