diff --git a/cockatrice/src/single_instance_manager.cpp b/cockatrice/src/single_instance_manager.cpp
index b207a9250..110fd8628 100644
--- a/cockatrice/src/single_instance_manager.cpp
+++ b/cockatrice/src/single_instance_manager.cpp
@@ -134,12 +134,15 @@ void SingleInstanceManager::handleNewConnection()
             socket->write(ACK_MESSAGE);
             socket->flush();
 
-            emit filesReceived(files);
-
-            // Reset buffer (single message use-case)
+            // Drop the payload from the buffer before handling it: the handlers
+            // run synchronously and can spin a nested event loop (e.g. a modal
+            // dialog) that re-reads this socket, which would re-parse and re-emit
+            // the same files.
             buffer->clear();
             *expectedSize = 0;
 
+            emit filesReceived(files);
+
             socket->disconnectFromServer();
             return;
         }