diff --git a/src/chat/modifier/file-transfer-chat-message-modifier.cpp b/src/chat/modifier/file-transfer-chat-message-modifier.cpp
index b8ff77dee..7d65df873 100644
--- a/src/chat/modifier/file-transfer-chat-message-modifier.cpp
+++ b/src/chat/modifier/file-transfer-chat-message-modifier.cpp
@@ -383,6 +383,11 @@ void FileTransferChatMessageModifier::processResponseFromPostFile (const belle_h
 				releaseHttpRequest();
 				fileUploadEndBackgroundTask();
 			}
+		} else if (code == 400) {
+			lWarning() << "Received HTTP code response " << code << " for file transfer, probably meaning file is too large";
+			chatMessage->updateState(ChatMessage::State::FileTransferError);
+			releaseHttpRequest();
+			fileUploadEndBackgroundTask();
 		} else {
 			lWarning() << "Unhandled HTTP code response " << code << " for file transfer";
 			chatMessage->updateState(ChatMessage::State::NotDelivered);