diff --git a/src/protocols/core/DataDevice.cpp b/src/protocols/core/DataDevice.cpp
index b7640af3..8c1a48d8 100644
--- a/src/protocols/core/DataDevice.cpp
+++ b/src/protocols/core/DataDevice.cpp
@@ -67,6 +67,13 @@ CWLDataOfferResource::CWLDataOfferResource(SP<CWlDataOffer> resource_, SP<IDataS
     });
 }
 
+CWLDataOfferResource::~CWLDataOfferResource() {
+    if (!source || !source->hasDnd() || dead)
+        return;
+
+    source->sendDndFinished();
+}
+
 bool CWLDataOfferResource::good() {
     return resource->resource();
 }
@@ -173,6 +180,7 @@ void CWLDataSourceResource::sendDndDropPerformed() {
     if (resource->version() < 3)
         return;
     resource->sendDndDropPerformed();
+    dropped = true;
 }
 
 void CWLDataSourceResource::sendDndFinished() {
diff --git a/src/protocols/core/DataDevice.hpp b/src/protocols/core/DataDevice.hpp
index 22bb9376..8aaf46be 100644
--- a/src/protocols/core/DataDevice.hpp
+++ b/src/protocols/core/DataDevice.hpp
@@ -29,6 +29,7 @@ class CMonitor;
 class CWLDataOfferResource {
   public:
     CWLDataOfferResource(SP<CWlDataOffer> resource_, SP<IDataSource> source_);
+    ~CWLDataOfferResource();
 
     bool            good();
     void            sendData();
@@ -63,14 +64,15 @@ class CWLDataSourceResource : public IDataSource {
     virtual bool                     hasDnd();
     virtual bool                     dndDone();
     virtual void                     error(uint32_t code, const std::string& msg);
+    virtual void                     sendDndFinished();
 
     void                             sendDndDropPerformed();
-    void                             sendDndFinished();
     void                             sendDndAction(wl_data_device_manager_dnd_action a);
 
     bool                             used       = false;
     bool                             dnd        = false;
     bool                             dndSuccess = false;
+    bool                             dropped    = false;
 
     WP<CWLDataDeviceResource>        device;
     WP<CWLDataSourceResource>        self;
diff --git a/src/protocols/types/DataDevice.cpp b/src/protocols/types/DataDevice.cpp
index eb6969cc..e95f1c76 100644
--- a/src/protocols/types/DataDevice.cpp
+++ b/src/protocols/types/DataDevice.cpp
@@ -19,3 +19,7 @@ void IDataSource::markUsed() {
 eDataSourceType IDataSource::type() {
     return DATA_SOURCE_TYPE_WAYLAND;
 }
+
+void IDataSource::sendDndFinished() {
+    ;
+}
diff --git a/src/protocols/types/DataDevice.hpp b/src/protocols/types/DataDevice.hpp
index 948f47a0..f6757e1c 100644
--- a/src/protocols/types/DataDevice.hpp
+++ b/src/protocols/types/DataDevice.hpp
@@ -21,6 +21,7 @@ class IDataSource {
     virtual void                     cancelled()                                = 0;
     virtual bool                     hasDnd();
     virtual bool                     dndDone();
+    virtual void                     sendDndFinished();
     virtual bool                     used();
     virtual void                     markUsed();
     virtual void                     error(uint32_t code, const std::string& msg) = 0;