diff --git a/src/client/Client.cc b/src/client/Client.cc
index dfe02d7..4c5e1ee 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -182,7 +182,8 @@ void Client::update(double elapsed_time)
                 client_packet >> players_port;
                 // Should be a much better way of doing this.
                 // Perhaps generate a random number
-                if(name == m_current_player_name)
+                if((name == m_current_player_name) &&
+                   (players_port == m_net_client->getLocalPort()))
                 {
                     m_current_player = pindex;
                 }