diff --git a/src/managers/SeatManager.cpp b/src/managers/SeatManager.cpp
index 8fee6b16..6d2b906f 100644
--- a/src/managers/SeatManager.cpp
+++ b/src/managers/SeatManager.cpp
@@ -194,7 +194,7 @@ void CSeatManager::setPointerFocus(SP<CWLSurfaceResource> surf, const Vector2D&
     if (state.pointerFocus == surf)
         return;
 
-    if (PROTO::data->dndActive()) {
+    if (PROTO::data->dndActive() && surf) {
         if (state.dndPointerFocus == surf)
             return;
         Debug::log(LOG, "[seatmgr] Refusing pointer focus during an active dnd, but setting dndPointerFocus");