diff --git a/src/app/molecules/message/Message.jsx b/src/app/molecules/message/Message.jsx
index 6b332c66..647b6728 100644
--- a/src/app/molecules/message/Message.jsx
+++ b/src/app/molecules/message/Message.jsx
@@ -13,7 +13,6 @@ import { getUsername } from '../../../util/matrixUtil';
 
 import Text from '../../atoms/text/Text';
 import RawIcon from '../../atoms/system-icons/RawIcon';
-import Avatar from '../../atoms/avatar/Avatar';
 import Tooltip from '../../atoms/tooltip/Tooltip';
 
 import ReplyArrowIC from '../../../../public/res/ic/outlined/reply-arrow.svg';
diff --git a/src/client/state/RoomsInput.js b/src/client/state/RoomsInput.js
index 584fefa9..7e34d4b1 100644
--- a/src/client/state/RoomsInput.js
+++ b/src/client/state/RoomsInput.js
@@ -201,6 +201,7 @@ class RoomsInput extends EventEmitter {
     this.roomIdToInput.set(roomId, input);
     if (input.attachment) {
       await this.sendFile(roomId, input.attachment.file);
+      if (!this.isSending(roomId)) return;
     }
 
     if (this.getMessage(roomId).trim() !== '') {