diff --git a/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift b/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift
index d4360d9ae..d0acba2d9 100644
--- a/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift
+++ b/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift
@@ -198,6 +198,9 @@ import AVFoundation
 				self.loadingView.isHidden = true
 				self.messageView.isLoading = false
 				self.loading.stopRotation()
+				
+				self.messageView.sendButton.isEnabled = true
+				self.messageView.pictureButton.isEnabled = true
 			}
 		}
 	}
@@ -230,6 +233,7 @@ import AVFoundation
 		} else {
 			self.messageView.sendButton.isEnabled = true
 		}
+		self.messageView.pictureButton.isEnabled = true
 		
 		workItem?.cancel()
 		for progressItem in progress{
@@ -1284,6 +1288,9 @@ import AVFoundation
 			messageView.isLoading = true
 			loading.startRotation()
 			
+			self.messageView.sendButton.isEnabled = false
+			self.messageView.pictureButton.isEnabled = false
+			
 			self.mediaCount = mediaCollectionView.count
 			self.newMediaCount = sequenceCount
 		}