diff --git a/src/egs_game.erl b/src/egs_game.erl
index c0a8f16..ba2ad5d 100644
--- a/src/egs_game.erl
+++ b/src/egs_game.erl
@@ -116,7 +116,7 @@ char_select(CSocket, GID, Version) ->
 			<< _:32, Command:16/unsigned-integer, _/bits >> = Orig,
 			char_select_handle(Command, CSocket, GID, Version, Orig);
 		{error, timeout} ->
-			egs_proto:send_keepalive(CSocket, GID),
+			egs_proto:send_keepalive(CSocket),
 			reload,
 			?MODULE:char_select(CSocket, GID, Version);
 		{error, closed} ->
@@ -395,7 +395,7 @@ loop(CSocket, GID, Version, SoFar) ->
 			egs_proto:send_chat(CSocket, Version, ChatGID, ChatName, ChatModifiers, ChatMessage),
 			?MODULE:loop(CSocket, GID, Version, SoFar);
 		{psu_keepalive} ->
-			egs_proto:send_keepalive(CSocket, GID),
+			egs_proto:send_keepalive(CSocket),
 			?MODULE:loop(CSocket, GID, Version, SoFar);
 		{psu_player_spawn, Spawn} ->
 			send_spawn(CSocket, GID, Spawn),
@@ -539,11 +539,6 @@ handle(16#0110, CSocket, GID, _, _) ->
 	log(GID, "death (and more)"),
 	lobby_load(CSocket, GID, 1100000, 0, 4, 6);
 
-%% @doc Keepalive handler. Do nothing.
-
-handle(16#021c, _, _, _, _) ->
-	ignore;
-
 %% @doc Uni cube handler.
 
 handle(16#021d, CSocket, _, _, _) ->
diff --git a/src/egs_proto.erl b/src/egs_proto.erl
index f1c1f47..2a78eda 100644
--- a/src/egs_proto.erl
+++ b/src/egs_proto.erl
@@ -207,10 +207,11 @@ send_init_quest(CSocket, GID, QuestID) ->
 		16#ffffffff:32, 16#ffffffff:32, 16#ffffffff:32, 16#ffffffff:32, 16#ffffffff:32, 16#ffffffff:32, 16#ffffffff:32, 16#ffffffff:32 >>,
 	packet_send(CSocket, Packet).
 
-%% @doc Keepalive.
+%% @doc Keepalive. Just send an empty packet, the game doesn't really care.
+%% @todo If there's an actual keepalive command, use it instead.
 
-send_keepalive(CSocket, GID) ->
-	Packet = << 16#2b1b:16, 0:208, GID:32/little-unsigned-integer, 0:64 >>,
+send_keepalive(CSocket) ->
+	Packet = << 0:32 >>,
 	packet_send(CSocket, Packet).
 
 %% @doc Make the client load the quest previously sent.