diff --git a/config/dwm/dwm.c b/config/dwm/dwm.c
index aa3cde64..d8770d6a 100644
--- a/config/dwm/dwm.c
+++ b/config/dwm/dwm.c
@@ -624,6 +624,8 @@ clientmessage(XEvent *e)
 			updatesystrayicongeom(c, wa.width, wa.height);
 			XAddToSaveSet(dpy, c->win);
 			XSelectInput(dpy, c->win, StructureNotifyMask | PropertyChangeMask | ResizeRedirectMask);
+      XClassHint ch = {"dwmsystray", "dwmsystray"};
+			XSetClassHint(dpy, c->win, &ch);
 			XReparentWindow(dpy, c->win, systray->win, 0, 0);
 			/* use parents background color */
 			swa.background_pixel  = scheme[SchemeNorm][ColBg].pixel;
diff --git a/config/picom/picom.conf b/config/picom/picom.conf
index 8638f11d..6ff115b0 100644
--- a/config/picom/picom.conf
+++ b/config/picom/picom.conf
@@ -49,7 +49,7 @@ shadow-exclude = [
   "class_g ?= 'Notify-osd'",
   "class_g = 'Cairo-clock'",
   "class_g = 'dwm'",
-  "_NET_WM_WINDOW_TYPE@:32a *= '_NET_WM_WINDOW_TYPE_DOCK'",
+  "class_g = 'dwmsystray'",
   "_GTK_FRAME_EXTENTS@:c"
 ];