diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServer.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServer.java
index e8ecf431881..56edc0284d0 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServer.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServer.java
@@ -663,16 +663,15 @@ public void startdata() throws IOException, InterruptedException {
 
     public synchronized void startup() {
         startupWithServerState(State.RUNNING);
-        notifyAll();
     }
 
     public synchronized void startupWithoutServing() {
         startupWithServerState(State.INITIAL);
-        notifyAll();
     }
 
     public synchronized void startServing() {
         setState(State.RUNNING);
+        notifyAll();
     }
 
     private void startupWithServerState(State state) {
@@ -695,6 +694,8 @@ private void startupWithServerState(State state) {
         requestPathMetricsCollector.start();
 
         localSessionEnabled = sessionTracker.isLocalSessionsEnabled();
+
+        notifyAll();
     }
 
     protected void startJvmPauseMonitor() {