diff --git a/src/network/controlconnection.cpp b/src/network/controlconnection.cpp
index 9206f335c..0cd3ac193 100644
--- a/src/network/controlconnection.cpp
+++ b/src/network/controlconnection.cpp
@@ -182,10 +182,12 @@ ControlConnection::handleMsg( msg_ptr msg )
     {
         qDebug() << "Received Connection PING, sending PONG.";
         sendMsg( Msg::factory( QByteArray(), Msg::PONG ) );
+        return;
     }
     else if ( msg->is( Msg::PONG ) )
     {
         qDebug() << "Received Connection PONG, nice.";
+        return;
     }
 
     // All control connection msgs are JSON