diff --git a/client/ui/chat/ChatFragment.tsx b/client/ui/chat/ChatFragment.tsx
index 467ef5b..0fbef9f 100644
--- a/client/ui/chat/ChatFragment.tsx
+++ b/client/ui/chat/ChatFragment.tsx
@@ -231,6 +231,7 @@ export default function ChatFragment({ target, showReturnButton, onReturnButtonC
             clearTimeout(sendingFilesSnackbarId)
             sendingFilesSnackbar.open = false
         }
+        Client.socket?.once('disconnect', () => endSendingSnack())
         try {
             setIsMessageSending(true)
             for (const fileName of Object.keys(cachedFiles.current)) {