diff --git a/xwl/selection.cpp b/xwl/selection.cpp
index 3c83bb8cdc..9e4da328d8 100644
--- a/xwl/selection.cpp
+++ b/xwl/selection.cpp
@@ -167,9 +167,11 @@ void Selection::registerXfixes()
 
 void Selection::setWlSource(WlSource *source)
 {
-    delete m_waylandSource;
+    if (m_waylandSource) {
+        m_waylandSource->deleteLater();
+        m_waylandSource = nullptr;
+    }
     delete m_xSource;
-    m_waylandSource = nullptr;
     m_xSource = nullptr;
     if (source) {
         m_waylandSource = source;
@@ -179,10 +181,7 @@ void Selection::setWlSource(WlSource *source)
 
 void Selection::createX11Source(xcb_xfixes_selection_notify_event_t *event)
 {
-    delete m_waylandSource;
-    delete m_xSource;
-    m_waylandSource = nullptr;
-    m_xSource = nullptr;
+    setWlSource(nullptr);
     if (!event || event->owner == XCB_WINDOW_NONE) {
         return;
     }