diff --git a/src/compositor_wayland.cpp b/src/compositor_wayland.cpp
index bdda9e9d29..36f80a76ed 100644
--- a/src/compositor_wayland.cpp
+++ b/src/compositor_wayland.cpp
@@ -311,6 +311,8 @@ void WaylandCompositor::addOutput(Output *output)
                 if (!outputLayer->endFrame(infiniteRegion(), infiniteRegion())) {
                     return false;
                 }
+            } else {
+                return false;
             }
             outputLayer->setEnabled(true);
             return output->updateCursorLayer();