diff --git a/src/cockpit/protocol.py b/src/cockpit/protocol.py
index 0593324b0924..e157b91412ef 100644
--- a/src/cockpit/protocol.py
+++ b/src/cockpit/protocol.py
@@ -164,6 +164,9 @@ def close(self, exc: 'Exception | None' = None) -> None:
             return
         self._closed = True
 
+        if isinstance(exc, CockpitProblem):
+            self.write_control(exc.get_attrs())
+
         if self.transport:
             self.transport.close()