diff --git a/nano/node/lmdb/lmdb.cpp b/nano/node/lmdb/lmdb.cpp
index fd2bc88c..b03b74f4 100644
--- a/nano/node/lmdb/lmdb.cpp
+++ b/nano/node/lmdb/lmdb.cpp
@@ -214,7 +214,7 @@ void nano::lmdb::store::open_databases (bool & error_a, nano::transaction const
 	error_a |= mdb_dbi_open (env.tx (transaction_a), "unchecked", flags, &unchecked_handle) != 0;
 	error_a |= mdb_dbi_open (env.tx (transaction_a), "online_weight", flags, &online_weight_store.online_weight_handle) != 0;
 	error_a |= mdb_dbi_open (env.tx (transaction_a), "meta", flags, &meta_handle) != 0;
-	error_a |= mdb_dbi_open (env.tx (transaction_a), "peers", flags, &peers_handle) != 0;
+	error_a |= mdb_dbi_open (env.tx (transaction_a), "peers", flags, &peer_store.peers_handle) != 0;
 	error_a |= mdb_dbi_open (env.tx (transaction_a), "pruned", flags, &pruned_store.pruned_handle) != 0;
 	error_a |= mdb_dbi_open (env.tx (transaction_a), "confirmation_height", flags, &confirmation_height_handle) != 0;
 	error_a |= mdb_dbi_open (env.tx (transaction_a), "accounts", flags, &account_store.accounts_v0_handle) != 0;
@@ -875,7 +875,7 @@ MDB_dbi nano::lmdb::store::table_to_dbi (tables table_a) const
 		case tables::meta:
 			return meta_handle;
 		case tables::peers:
-			return peers_handle;
+			return peer_store.peers_handle;
 		case tables::pruned:
 			return pruned_store.pruned_handle;
 		case tables::confirmation_height:
@@ -884,7 +884,7 @@ MDB_dbi nano::lmdb::store::table_to_dbi (tables table_a) const
 			return final_votes_handle;
 		default:
 			release_assert (false);
-			return peers_handle;
+			return peer_store.peers_handle;
 	}
 }
 
diff --git a/nano/node/lmdb/lmdb.hpp b/nano/node/lmdb/lmdb.hpp
index 403ce611..5c11371b 100644
--- a/nano/node/lmdb/lmdb.hpp
+++ b/nano/node/lmdb/lmdb.hpp
@@ -148,12 +148,6 @@ namespace lmdb
 	 */
 		MDB_dbi meta_handle{ 0 };
 
-		/*
-	 * Endpoints for peers
-	 * nano::endpoint_key -> no_value
-	*/
-		MDB_dbi peers_handle{ 0 };
-
 		/*
 	 * Confirmation height of an account, and the hash for the block at that height
 	 * nano::account -> uint64_t, nano::block_hash
diff --git a/nano/node/lmdb/peer_store.hpp b/nano/node/lmdb/peer_store.hpp
index 164cfe65..018b85e9 100644
--- a/nano/node/lmdb/peer_store.hpp
+++ b/nano/node/lmdb/peer_store.hpp
@@ -2,6 +2,8 @@
 
 #include <nano/secure/store.hpp>
 
+#include <lmdb/libraries/liblmdb/lmdb.h>
+
 namespace nano
 {
 namespace lmdb
@@ -21,6 +23,12 @@ namespace lmdb
 		void clear (nano::write_transaction const & transaction_a) override;
 		nano::store_iterator<nano::endpoint_key, nano::no_value> begin (nano::transaction const & transaction_a) const override;
 		nano::store_iterator<nano::endpoint_key, nano::no_value> end () const override;
+
+		/*
+		 * Endpoints for peers
+		 * nano::endpoint_key -> no_value
+		*/
+		MDB_dbi peers_handle{ 0 };
 	};
 }
 }