diff --git a/src/plugins/platforms/wayland/qwaylandbuffer.cpp b/src/plugins/platforms/wayland/qwaylandbuffer.cpp
index 1907d586487..dd99b702bcf 100644
--- a/src/plugins/platforms/wayland/qwaylandbuffer.cpp
+++ b/src/plugins/platforms/wayland/qwaylandbuffer.cpp
@@ -31,6 +31,13 @@ void QWaylandBuffer::release(void *data, wl_buffer *)
     QWaylandBuffer *self = static_cast<QWaylandBuffer *>(data);
     self->mBusy = false;
     self->mCommitted = false;
+    if (self->mDeleteOnRelease)
+        delete self;
+}
+
+void QWaylandBuffer::setDeleteOnRelease(bool deleteOnRelease)
+{
+    mDeleteOnRelease = deleteOnRelease;
 }
 
 const wl_buffer_listener QWaylandBuffer::listener = {
diff --git a/src/plugins/platforms/wayland/qwaylandbuffer_p.h b/src/plugins/platforms/wayland/qwaylandbuffer_p.h
index 3798ef3ebbf..c96f213b9e8 100644
--- a/src/plugins/platforms/wayland/qwaylandbuffer_p.h
+++ b/src/plugins/platforms/wayland/qwaylandbuffer_p.h
@@ -43,12 +43,15 @@ public:
     void setCommitted() { mCommitted = true; }
     bool committed() const { return mCommitted; }
 
+    void setDeleteOnRelease(bool deleteOnRelease);
+
 protected:
     struct wl_buffer *mBuffer = nullptr;
 
 private:
     bool mBusy = false;
     bool mCommitted = false;
+    bool mDeleteOnRelease = false;
 
     static void release(void *data, wl_buffer *);
     static const wl_buffer_listener listener;