diff --git a/shell/panelshadows.cpp b/shell/panelshadows.cpp
index c97564a24..953a5c9cc 100644
--- a/shell/panelshadows.cpp
+++ b/shell/panelshadows.cpp
@@ -473,6 +473,9 @@ void PanelShadows::Private::updateShadow(const QWindow *window, Plasma::FrameSvg
     }
 
     Display *dpy = QX11Info::display();
+    if (!dpy) {
+        return;
+    }
     Atom atom = XInternAtom(dpy, "_KDE_NET_WM_SHADOW", False);
 
 //     qDebug() << "going to set the shadow of" << window->winId() << "to" << data;
@@ -491,6 +494,9 @@ void PanelShadows::Private::clearShadow(const QWindow *window)
         return;
     }
     Display *dpy = QX11Info::display();
+    if (!dpy) {
+        return;
+    }
     Atom atom = XInternAtom(dpy, "_KDE_NET_WM_SHADOW", False);
     XDeleteProperty(dpy, window->winId(), atom);
 #else