diff --git a/core/include/aoclient.h b/core/include/aoclient.h
index 7dd5f78..2fb9e98 100644
--- a/core/include/aoclient.h
+++ b/core/include/aoclient.h
@@ -2181,7 +2181,7 @@ class AOClient : public QObject {
     /**
      * @brief The size, in bytes, of the last data the client sent to the server.
      */
-    int last_read;
+    int last_read = 0;
 
     /**
      * @brief A helper function for logging in a client as moderator.
diff --git a/core/src/aoclient.cpp b/core/src/aoclient.cpp
index a085ac2..351477d 100644
--- a/core/src/aoclient.cpp
+++ b/core/src/aoclient.cpp
@@ -23,6 +23,11 @@ void AOClient::clientData()
         socket->close();
     }
 
+    if (last_read == 0) { // i.e. this is the first packet we've been sent
+        if (!socket->waitForConnected(1000)) {
+            socket->close();
+        }
+    }
     QString data = QString::fromUtf8(socket->readAll());
     last_read = data.size();