diff --git a/types/tablet_v2/wlr_tablet_v2_pad.c b/types/tablet_v2/wlr_tablet_v2_pad.c
index 515d1fbb..fdffd475 100644
--- a/types/tablet_v2/wlr_tablet_v2_pad.c
+++ b/types/tablet_v2/wlr_tablet_v2_pad.c
@@ -171,6 +171,9 @@ void destroy_tablet_pad_v2(struct wl_resource *resource) {
 	}
 	free(pad->strips);
 
+	if (pad->pad->current_client == pad) {
+		pad->pad->current_client = NULL;
+	}
 	free(pad);
 	wl_resource_set_user_data(resource, NULL);
 }