diff --git a/consul/server.go b/consul/server.go
index b1a744f4c7..dad30d2f49 100644
--- a/consul/server.go
+++ b/consul/server.go
@@ -177,12 +177,6 @@ func NewServer(config *Config) (*Server, error) {
 		shutdownCh:    make(chan struct{}),
 	}
 
-	// Initialize the RPC layer
-	if err := s.setupRPC(tlsConfig); err != nil {
-		s.Shutdown()
-		return nil, fmt.Errorf("Failed to start RPC layer: %v", err)
-	}
-
 	// Initialize the Raft server
 	if err := s.setupRaft(); err != nil {
 		s.Shutdown()
@@ -209,6 +203,12 @@ func NewServer(config *Config) (*Server, error) {
 		return nil, fmt.Errorf("Failed to start wan serf: %v", err)
 	}
 
+	// Initialize the RPC layer
+	if err := s.setupRPC(tlsConfig); err != nil {
+		s.Shutdown()
+		return nil, fmt.Errorf("Failed to start RPC layer: %v", err)
+	}
+
 	return s, nil
 }