diff --git a/src/wayland/wayland_connection.cpp b/src/wayland/wayland_connection.cpp
index 7f218aaae3..7289fd1ff0 100644
--- a/src/wayland/wayland_connection.cpp
+++ b/src/wayland/wayland_connection.cpp
@@ -268,19 +268,19 @@ namespace {
     static_cast<WaylandConnection*>(data)->onOutputHeadSerialNumber(head, serialNumber);
   }
 
-  // Mode listener: release the proxy only when the compositor sends 'finished'.
-  void modeFinished(void* /*data*/, zwlr_output_mode_v1* mode) { zwlr_output_mode_v1_release(mode); }
+  void outputModeFinished(void* data, zwlr_output_mode_v1* mode) {
+    static_cast<WaylandConnection*>(data)->onOutputModeFinished(mode);
+  }
 
   const zwlr_output_mode_v1_listener kOutputModeListener = {
       .size = [](void*, zwlr_output_mode_v1*, int32_t, int32_t) {},
       .refresh = [](void*, zwlr_output_mode_v1*, int32_t) {},
       .preferred = [](void*, zwlr_output_mode_v1*) {},
-      .finished = modeFinished,
+      .finished = outputModeFinished,
   };
 
-  // Retain mode proxies; released by mode.finished (compositor guarantees it before head.finished).
-  void outputHeadMode(void* /*data*/, zwlr_output_head_v1* /*head*/, zwlr_output_mode_v1* mode) {
-    zwlr_output_mode_v1_add_listener(mode, &kOutputModeListener, nullptr);
+  void outputHeadMode(void* data, zwlr_output_head_v1* head, zwlr_output_mode_v1* mode) {
+    static_cast<WaylandConnection*>(data)->onOutputHeadMode(head, mode);
   }
 
   void outputHeadFinished(void* data, zwlr_output_head_v1* head) {
@@ -833,6 +833,20 @@ void WaylandConnection::onOutputHeadSerialNumber(zwlr_output_head_v1* head, cons
   }
 }
 
+void WaylandConnection::onOutputHeadMode(zwlr_output_head_v1* /*head*/, zwlr_output_mode_v1* mode) {
+  if (mode == nullptr) {
+    return;
+  }
+  m_outputModes.insert(mode);
+  zwlr_output_mode_v1_add_listener(mode, &kOutputModeListener, this);
+}
+
+void WaylandConnection::onOutputModeFinished(zwlr_output_mode_v1* mode) {
+  if (m_outputModes.erase(mode) > 0) {
+    zwlr_output_mode_v1_release(mode);
+  }
+}
+
 void WaylandConnection::onOutputHeadFinished(zwlr_output_head_v1* head) {
   m_outputHeads.erase(head);
   zwlr_output_head_v1_release(head);
@@ -866,6 +880,10 @@ void WaylandConnection::matchPendingOutputHeads() {
 }
 
 void WaylandConnection::onOutputManagerFinished(zwlr_output_manager_v1* manager) {
+  for (auto* mode : m_outputModes) {
+    zwlr_output_mode_v1_release(mode);
+  }
+  m_outputModes.clear();
   for (const auto& entry : m_outputHeads) {
     zwlr_output_head_v1_release(entry.first);
   }
@@ -1354,6 +1372,10 @@ void WaylandConnection::cleanup() {
     m_screencopyManager = nullptr;
   }
 
+  for (auto* mode : m_outputModes) {
+    zwlr_output_mode_v1_release(mode);
+  }
+  m_outputModes.clear();
   for (const auto& entry : m_outputHeads) {
     zwlr_output_head_v1_release(entry.first);
   }
diff --git a/src/wayland/wayland_connection.h b/src/wayland/wayland_connection.h
index b261cb2026..f42002badc 100644
--- a/src/wayland/wayland_connection.h
+++ b/src/wayland/wayland_connection.h
@@ -13,6 +13,7 @@
 #include <string>
 #include <string_view>
 #include <unordered_map>
+#include <unordered_set>
 #include <vector>
 
 struct wl_compositor;
@@ -49,6 +50,7 @@ struct wp_fractional_scale_manager_v1;
 struct wp_viewporter;
 struct zwlr_output_manager_v1;
 struct zwlr_output_head_v1;
+struct zwlr_output_mode_v1;
 class ClipboardService;
 class FocusGrabService;
 struct DataControlOps;
@@ -261,6 +263,8 @@ class WaylandConnection {
   void onOutputHeadMake(zwlr_output_head_v1* head, const char* make);
   void onOutputHeadModel(zwlr_output_head_v1* head, const char* model);
   void onOutputHeadSerialNumber(zwlr_output_head_v1* head, const char* serialNumber);
+  void onOutputHeadMode(zwlr_output_head_v1* head, zwlr_output_mode_v1* mode);
+  void onOutputModeFinished(zwlr_output_mode_v1* mode);
   void onOutputHeadFinished(zwlr_output_head_v1* head);
   // wl_output.name and the done event race; call from both sides to match either order.
   void matchPendingOutputHeads();
@@ -294,6 +298,7 @@ class WaylandConnection {
   zwlr_screencopy_manager_v1* m_screencopyManager = nullptr;
   zwlr_output_manager_v1* m_outputManager = nullptr;
   std::unordered_map<zwlr_output_head_v1*, WaylandOutputHeadInfo> m_outputHeads;
+  std::unordered_set<zwlr_output_mode_v1*> m_outputModes;
   std::unique_ptr<FocusGrabService> m_focusGrabService;
   wp_viewporter* m_viewporter = nullptr;
   bool m_backgroundEffectBlurSupported = false;