diff --git a/src/helpers/Monitor.cpp b/src/helpers/Monitor.cpp
index 7d44b0c0..bf97a80c 100644
--- a/src/helpers/Monitor.cpp
+++ b/src/helpers/Monitor.cpp
@@ -194,7 +194,8 @@ void CMonitor::onDisconnect() {
 
     for (size_t i = 0; i < 4; ++i) {
         for (auto& ls : m_aLayerSurfaceLayers[i]) {
-            wlr_layer_surface_v1_destroy(ls->layerSurface);
+            if (ls->layerSurface && !ls->fadingOut)
+                wlr_layer_surface_v1_destroy(ls->layerSurface);
         }
         m_aLayerSurfaceLayers[i].clear();
     }