diff --git a/.changelog/17483.txt b/.changelog/17483.txt
new file mode 100644
index 00000000000..26c81dbe4cd
--- /dev/null
+++ b/.changelog/17483.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+peering: Fix a bug that caused server agents to continue cleaning up peering resources even after loss of leadership.
+```
diff --git a/.changelog/_5614.txt b/.changelog/_5614.txt
new file mode 100644
index 00000000000..9951b911187
--- /dev/null
+++ b/.changelog/_5614.txt
@@ -0,0 +1,4 @@
+```release-note:bug
+namespaces: **(Enterprise only)** fixes a bug where namespaces are stuck in a deferred deletion state indefinitely under some conditions.
+Also fixes the Consul query metadata present in the HTTP headers of the namespace read and list endpoints.
+```
diff --git a/agent/consul/leader.go b/agent/consul/leader.go
index 9891c4b3d2b..c68ccdc45cd 100644
--- a/agent/consul/leader.go
+++ b/agent/consul/leader.go
@@ -354,6 +354,8 @@ func (s *Server) revokeLeadership() {
 
 	s.revokeEnterpriseLeadership()
 
+	s.stopDeferredDeletion()
+
 	s.stopFederationStateAntiEntropy()
 
 	s.stopFederationStateReplication()