diff --git a/src/bgp/bgp_peer.cc b/src/bgp/bgp_peer.cc
index d54922674ff..9ec4a5b6628 100644
--- a/src/bgp/bgp_peer.cc
+++ b/src/bgp/bgp_peer.cc
@@ -362,7 +362,6 @@ BgpPeer::BgpPeer(BgpServer *server, RoutingInstance *instance,
           admin_down_(config->admin_down()),
           passive_(config->passive()),
           resolve_paths_(config->router_type() == "bgpaas-client"),
-          state_machine_(BgpObjectFactory::Create<StateMachine>(this)),
           membership_req_pending_(0),
           defer_close_(false),
           vpn_tables_registered_(false),
@@ -376,6 +375,7 @@ BgpPeer::BgpPeer(BgpServer *server, RoutingInstance *instance,
           policy_((config->peer_as() == config->local_as()) ?
                       BgpProto::IBGP : BgpProto::EBGP,
                   RibExportPolicy::BGP, config->peer_as(), -1, 0),
+          state_machine_(BgpObjectFactory::Create<StateMachine>(this)),
           peer_close_(new PeerClose(this)),
           peer_stats_(new PeerStats(this)),
           deleter_(new DeleteActor(this)),
diff --git a/src/bgp/bgp_peer.h b/src/bgp/bgp_peer.h
index 5f0e67a536c..b75374c2789 100644
--- a/src/bgp/bgp_peer.h
+++ b/src/bgp/bgp_peer.h
@@ -383,7 +383,6 @@ class BgpPeer : public IPeer {
     bool passive_;
     bool resolve_paths_;
 
-    boost::scoped_ptr<StateMachine> state_machine_;
     uint64_t membership_req_pending_;
     bool defer_close_;
     bool vpn_tables_registered_;
@@ -398,6 +397,7 @@ class BgpPeer : public IPeer {
     std::vector<std::string> negotiated_families_;
     BgpProto::BgpPeerType peer_type_;
     RibExportPolicy policy_;
+    boost::scoped_ptr<StateMachine> state_machine_;
     boost::scoped_ptr<PeerClose> peer_close_;
     boost::scoped_ptr<PeerStats> peer_stats_;
     boost::scoped_ptr<DeleteActor> deleter_;