diff --git a/loginserver/world_server.cpp b/loginserver/world_server.cpp
index 43846af32..90b4ea160 100644
--- a/loginserver/world_server.cpp
+++ b/loginserver/world_server.cpp
@@ -72,7 +72,7 @@ WorldServer::WorldServer(std::shared_ptr<EQ::Net::ServertalkServerConnection> wo
 		std::bind(&WorldServer::ProcessLSAccountUpdate, this, std::placeholders::_1, std::placeholders::_2)
 	);
 
-	m_keepalive = std::make_unique<EQ::Timer>(5000, true, std::bind(&WorldServer::OnKeepAlive, this, std::placeholders::_1));
+	m_keepalive = std::make_unique<EQ::Timer>(1000, true, std::bind(&WorldServer::OnKeepAlive, this, std::placeholders::_1));
 }
 
 WorldServer::~WorldServer() = default;
diff --git a/world/login_server.cpp b/world/login_server.cpp
index da649495e..8d93a6128 100644
--- a/world/login_server.cpp
+++ b/world/login_server.cpp
@@ -552,7 +552,7 @@ bool LoginServer::Connect()
 		);
 	}
 
-	m_keepalive = std::make_unique<EQ::Timer>(5000, true, std::bind(&LoginServer::OnKeepAlive, this, std::placeholders::_1));
+	m_keepalive = std::make_unique<EQ::Timer>(1000, true, std::bind(&LoginServer::OnKeepAlive, this, std::placeholders::_1));
 
 	return true;
 }
diff --git a/world/zonelist.cpp b/world/zonelist.cpp
index 51acd0c01..666ed2208 100644
--- a/world/zonelist.cpp
+++ b/world/zonelist.cpp
@@ -43,7 +43,7 @@ ZSList::ZSList()
 	memset(pLockedZones, 0, sizeof(pLockedZones));
 
 	m_tick = std::make_unique<EQ::Timer>(5000, true, std::bind(&ZSList::OnTick, this, std::placeholders::_1));
-	m_keepalive = std::make_unique<EQ::Timer>(2500, true, std::bind(&ZSList::OnKeepAlive, this, std::placeholders::_1));
+	m_keepalive = std::make_unique<EQ::Timer>(1500, true, std::bind(&ZSList::OnKeepAlive, this, std::placeholders::_1));
 }
 
 ZSList::~ZSList() {
diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp
index 5a5595f6f..ce1cf892c 100644
--- a/zone/worldserver.cpp
+++ b/zone/worldserver.cpp
@@ -86,7 +86,7 @@ void WorldServer::Connect()
 
 	m_connection->OnMessage(std::bind(&WorldServer::HandleMessage, this, std::placeholders::_1, std::placeholders::_2));
 
-	m_keepalive = std::make_unique<EQ::Timer>(2500, true, std::bind(&WorldServer::OnKeepAlive, this, std::placeholders::_1));
+	m_keepalive = std::make_unique<EQ::Timer>(1000, true, std::bind(&WorldServer::OnKeepAlive, this, std::placeholders::_1));
 }
 
 bool WorldServer::SendPacket(ServerPacket *pack)