diff --git a/src/charm.py b/src/charm.py
index ccbce436f3..ece2c2ad46 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -261,9 +261,7 @@ def get_secret(self, scope: Scopes, key: str) -> Optional[str]:
 
         secret_key = self._translate_field_to_secret_key(key)
         # Old translation in databag is to be taken
-        if key != secret_key and (
-            result := self.peer_relation_data(scope).fetch_my_relation_field(peers.id, key)
-        ):
+        if result := self.peer_relation_data(scope).fetch_my_relation_field(peers.id, key):
             return result
 
         return self.peer_relation_data(scope).get_secret(peers.id, secret_key)
@@ -279,10 +277,7 @@ def set_secret(self, scope: Scopes, key: str, value: Optional[str]) -> Optional[
         peers = self.model.get_relation(PEER)
         secret_key = self._translate_field_to_secret_key(key)
         # Old translation in databag is to be deleted
-        if key != secret_key and self.peer_relation_data(scope).fetch_my_relation_field(
-            peers.id, key
-        ):
-            self.peer_relation_data(scope).delete_relation_data(peers.id, [key])
+        self.peer_relation_data(scope).delete_relation_data(peers.id, [key])
         self.peer_relation_data(scope).set_secret(peers.id, secret_key, value)
 
     def remove_secret(self, scope: Scopes, key: str) -> None:
diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
index 949af8517b..3e033a1b6b 100644
--- a/tests/unit/test_charm.py
+++ b/tests/unit/test_charm.py
@@ -207,7 +207,6 @@ def test_on_postgresql_pebble_ready_no_connection(harness):
 
 def test_on_get_password(harness):
     # Create a mock event and set passwords in peer relation data.
-    harness.set_leader(True)
     mock_event = MagicMock(params={})
     rel_id = harness.model.get_relation(PEER).id
     harness.update_relation_data(