diff --git a/src/protocols/core/Compositor.cpp b/src/protocols/core/Compositor.cpp
index 7275cbf8..368b8ed4 100644
--- a/src/protocols/core/Compositor.cpp
+++ b/src/protocols/core/Compositor.cpp
@@ -151,8 +151,10 @@ CWLSurfaceResource::~CWLSurfaceResource() {
 }
 
 void CWLSurfaceResource::destroy() {
-    if (mapped)
+    if (mapped) {
         unmap();
+        events.unmap.emit();
+    }
     events.destroy.emit();
     PROTO::compositor->destroyResource(this);
 }