diff --git a/src/layout/algorithm/tiled/master/MasterAlgorithm.cpp b/src/layout/algorithm/tiled/master/MasterAlgorithm.cpp
index b4d4eea1e..18f1b4848 100644
--- a/src/layout/algorithm/tiled/master/MasterAlgorithm.cpp
+++ b/src/layout/algorithm/tiled/master/MasterAlgorithm.cpp
@@ -208,6 +208,9 @@ void CMasterAlgorithm::removeTarget(SP<ITarget> target) {
 
     const auto  PNODE = getNodeFromTarget(target);
 
+    if (!PNODE)
+        return;
+
     if (target->fullscreenMode() != FSMODE_NONE)
         g_pCompositor->setWindowFullscreenInternal(target->window(), FSMODE_NONE);