diff --git a/client/displayservers/X11/atoms.h b/client/displayservers/X11/atoms.h
index 42e03f7c..1d98a463 100644
--- a/client/displayservers/X11/atoms.h
+++ b/client/displayservers/X11/atoms.h
@@ -24,6 +24,7 @@
 #define DEF_ATOMS() \
   DEF_ATOM(_NET_REQUEST_FRAME_EXTENTS, True) \
   DEF_ATOM(_NET_FRAME_EXTENTS, True) \
+  DEF_ATOM(_NET_WM_BYPASS_COMPOSITOR, True) \
   DEF_ATOM(_NET_WM_STATE, True) \
   DEF_ATOM(_NET_WM_STATE_FULLSCREEN, True) \
   DEF_ATOM(_NET_WM_STATE_MAXIMIZED_HORZ, True) \
diff --git a/client/displayservers/X11/x11.c b/client/displayservers/X11/x11.c
index de0de5f2..b070bcec 100644
--- a/client/displayservers/X11/x11.c
+++ b/client/displayservers/X11/x11.c
@@ -394,14 +394,11 @@ static bool x11Init(const LG_DSInitParams params)
     goto fail_window;
   }
 
-  Atom NETWM_BYPASS_COMPOSITOR = XInternAtom(x11.display,
-      "NETWM_BYPASS_COMPOSITOR", False);
-
   unsigned long value = 1;
   XChangeProperty(
     x11.display,
     x11.window,
-    NETWM_BYPASS_COMPOSITOR,
+    x11atoms._NET_WM_BYPASS_COMPOSITOR,
     XA_CARDINAL,
     32,
     PropModeReplace,