diff --git a/dwm.c b/dwm.c
index 6b1ce9c..02dea6b 100644
--- a/dwm.c
+++ b/dwm.c
@@ -1234,9 +1234,6 @@ cleanup(void)
 			removesystrayicon(systray->icons);
 		if (systray->win) {
 			XUnmapWindow(dpy, systray->win);
-			#if RESTARTSIG_PATCH
-			if (!restart)
-			#endif // RESTARTSIG_PATCH
 			XDestroyWindow(dpy, systray->win);
 		}
 		free(systray);
diff --git a/patch/bar_systray.c b/patch/bar_systray.c
index 36d569a..158dfa3 100644
--- a/patch/bar_systray.c
+++ b/patch/bar_systray.c
@@ -111,6 +111,7 @@ removesystrayicon(Client *i)
 	for (ii = &systray->icons; *ii && *ii != i; ii = &(*ii)->next);
 	if (ii)
 		*ii = i->next;
+	XReparentWindow(dpy, i->win, root, 0, 0);
 	free(i);
 	drawbarwin(systray->bar);
 }