diff --git a/src/helpers/WLSurface.cpp b/src/helpers/WLSurface.cpp
index 889e9885..38c31e1a 100644
--- a/src/helpers/WLSurface.cpp
+++ b/src/helpers/WLSurface.cpp
@@ -33,6 +33,8 @@ void CWLSurface::destroy() {
     if (g_pCompositor->m_pLastFocus == m_pWLRSurface)
         g_pCompositor->m_pLastFocus = nullptr;
 
+    m_pWLRSurface = nullptr;
+
     Debug::log(LOG, "CWLSurface %x called destroy()", this);
 }