diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/HazelcastCoreTopologyService.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/HazelcastCoreTopologyService.java
index ec8bc07059e3f..ce86801f4e2c2 100644
--- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/HazelcastCoreTopologyService.java
+++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/HazelcastCoreTopologyService.java
@@ -91,6 +91,7 @@ public class HazelcastCoreTopologyService extends AbstractTopologyService implem
     private volatile CoreTopology coreTopology = CoreTopology.EMPTY;
     private volatile Map<MemberId,AdvertisedSocketAddress> catchupAddressMap = new HashMap<>();
     private volatile Map<MemberId,RoleInfo> coreRoles = Collections.emptyMap();
+    private volatile Optional<LeaderInfo> stepDownInfo = Optional.empty();
 
     private Thread startingThread;
     private volatile boolean stopped;
@@ -134,8 +135,9 @@ public boolean setClusterId( ClusterId clusterId, String dbName ) throws Interru
     @Override
     public void setLeader( LeaderInfo leaderInfo, String dbName )
     {
-        if ( this.leaderInfo.term() < leaderInfo.term() )
+        if ( this.leaderInfo.term() < leaderInfo.term() && localDBName.equals( dbName ) )
         {
+            log.info( "Leader %s updating leader info for database %s and term %s", myself, localDBName, leaderInfo.term() );
             this.leaderInfo = leaderInfo;
         }
     }
@@ -143,12 +145,16 @@ public void setLeader( LeaderInfo leaderInfo, String dbName )
     @Override
     public void handleStepDown( long term, String dbName )
     {
-        boolean wasLeaderForTerm = Objects.equals( myself, leaderInfo.memberId() ) && term == leaderInfo.term();
-        if ( wasLeaderForTerm )
+        boolean wasLeaderForDbAndTerm =
+                Objects.equals( myself, leaderInfo.memberId() ) &&
+                localDBName.equals( dbName ) &&
+                term == leaderInfo.term();
+
+        if ( wasLeaderForDbAndTerm )
         {
             log.info( "Step down event detected. This topology member, with MemberId %s, was leader in term %s, now moving " +
                     "to follower.", myself, leaderInfo.term() );
-            HazelcastClusterTopology.casLeaders( hazelcastInstance, leaderInfo.stepDown(), dbName );
+            stepDownInfo = Optional.of( leaderInfo.stepDown() );
         }
     }
 
@@ -367,10 +373,11 @@ private void refreshRoles() throws InterruptedException
 
         if ( leaderInfo.memberId() != null && leaderInfo.memberId().equals( myself ) )
         {
-            log.info( "Leader %s updating leader info for database %s and term %s", myself, localDBName, leaderInfo.term() );
             HazelcastClusterTopology.casLeaders( hazelcastInstance, leaderInfo, localDBName );
         }
 
+        stepDownInfo.ifPresent( s -> HazelcastClusterTopology.casLeaders( hazelcastInstance, s, localDBName ) );
+
         coreRoles = HazelcastClusterTopology.getCoreRoles( hazelcastInstance, allCoreServers().members().keySet() );
     }
 
diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ClusterOverviewIT.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ClusterOverviewIT.java
index e8b4ec0d16c89..fd61fad605e48 100644
--- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ClusterOverviewIT.java
+++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ClusterOverviewIT.java
@@ -314,7 +314,7 @@ private void assertEventualOverview( Cluster cluster, Matcher<List<MemberInfo>>
         Function<List<MemberInfo>, String> printableMemberInfos =
                 memberInfos -> memberInfos.stream().map( MemberInfo::toString ).collect( Collectors.joining( ", " ) );
         assertEventually( memberInfos -> "should have overview from core " + coreServerId + " but view was " + printableMemberInfos.apply( memberInfos ),
-                () -> clusterOverview( cluster.getCoreMemberById( coreServerId ).database() ), expected, 60, SECONDS );
+                () -> clusterOverview( cluster.getCoreMemberById( coreServerId ).database() ), expected, 90, SECONDS );
     }
 
     @SafeVarargs