diff --git a/src/server/server.go b/src/server/server.go
index 5c6d4d9581..2312d2b73b 100644
--- a/src/server/server.go
+++ b/src/server/server.go
@@ -75,8 +75,6 @@ func NewServer(config *configuration.Configuration) (*Server, error) {
 }
 
 func (self *Server) ListenAndServe() error {
-	go self.ProtobufServer.ListenAndServe()
-
 	err := self.RaftServer.ListenAndServe()
 	if err != nil {
 		return err
@@ -88,6 +86,8 @@ func (self *Server) ListenAndServe() error {
 
 	time.Sleep(5 * time.Second)
 
+	go self.ProtobufServer.ListenAndServe()
+
 	log.Info("Recovering from log...")
 	err = self.ClusterConfig.RecoverFromWAL()
 	if err != nil {