diff --git a/core/include/ws_client.h b/core/include/ws_client.h
index f5b1d96..f200e95 100644
--- a/core/include/ws_client.h
+++ b/core/include/ws_client.h
@@ -104,6 +104,16 @@ private:
      * @brief The WebSocket representing an incoming connection.
      */
     QWebSocket* web_socket;
+
+    /**
+     * @brief Stores partial packets in case they don't all come through the TCP socket at once
+     */
+    QByteArray partial_packet;
+
+    /**
+     * @brief Flag that is set when packets are segmented
+     */
+    bool is_segmented = false;
 };
 
 #endif // WS_CLIENT_H
diff --git a/core/src/ws_client.cpp b/core/src/ws_client.cpp
index e74c65a..8aa88e3 100644
--- a/core/src/ws_client.cpp
+++ b/core/src/ws_client.cpp
@@ -26,6 +26,20 @@ void WSClient::onWsData(QString message)
 void WSClient::onTcpData()
 {
     QByteArray tcp_message = tcp_socket->readAll();
+
+    if (!tcp_message.endsWith("#%")) {
+        partial_packet.append(tcp_message);
+        is_segmented = true;
+        return;
+    }
+
+    if (is_segmented) {
+        partial_packet.append(tcp_message);
+        tcp_message = partial_packet;
+        partial_packet.clear();
+        is_segmented = false;
+    }
+
     // Workaround for WebAO bug needing every packet in its own message
     QStringList all_packets = QString::fromUtf8(tcp_message).split("%");
     all_packets.removeLast(); // Remove empty space after final delimiter