diff --git a/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala b/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala
index e2ab797e22..859a598e9b 100644
--- a/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala
+++ b/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala
@@ -981,9 +981,9 @@ class ClusterSingletonManager(singletonProps: Props, terminationMessage: Any, se
     case Event(MemberRemoved(m, _), _) if m.uniqueAddress == cluster.selfUniqueAddress =>
       logInfo("Self removed, stopping ClusterSingletonManager")
       stop()
-    case Event(_: OldestChanged, _) =>
+    case Event(_: OldestChanged | HandOverToMe, _) =>
       // not interested anymore - waiting for removal
-      stay
+      stay()
   }
 
   def selfMemberExited(): Unit = {