diff --git a/src/charm.py b/src/charm.py
index f796d88..53db8fc 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -309,7 +309,8 @@ def _on_redis_relation_created(self, event):
             return
 
         self._peers.data[self.app]["enable-password"] = "false"
-        event.relation.data[self.app][LEADER_HOST_KEY] = self.current_master
+        if self.current_master:
+            event.relation.data[self.app][LEADER_HOST_KEY] = self.current_master
 
         self._update_layer()