diff --git a/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift b/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift
index d2a7af715..f8284cf8b 100644
--- a/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift
+++ b/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift
@@ -24,9 +24,9 @@ import linphonesw
 import DropDown
 import PhotosUI
 import AVFoundation
-import MCEmojiPicker
+import EmojiPicker
 
-class ChatConversationViewSwift: BackActionsNavigationView, PHPickerViewControllerDelegate, UIDocumentPickerDelegate, UICompositeViewDelegate, UICollectionViewDataSource, UICollectionViewDelegate, UIImagePickerControllerDelegate, MCEmojiPickerDelegate, CoreDelegate & UINavigationControllerDelegate{ // Replaces ChatConversationView
+class ChatConversationViewSwift: BackActionsNavigationView, PHPickerViewControllerDelegate, UIDocumentPickerDelegate, UICompositeViewDelegate, UICollectionViewDataSource, UICollectionViewDelegate, UIImagePickerControllerDelegate, EmojiPickerDelegate, CoreDelegate & UINavigationControllerDelegate{ // Replaces ChatConversationView
 	
 	static let compositeDescription = UICompositeViewDescription(ChatConversationViewSwift.self, statusBar: StatusBarView.self, tabBar: nil, sideMenu: SideMenuView.self, fullscreen: false, isLeftFragment: false,fragmentWith: nil)
 	
@@ -1354,10 +1354,10 @@ class ChatConversationViewSwift: BackActionsNavigationView, PHPickerViewControll
 	
 	@objc private func openEmojiPickerModule(sender: UIButton) {
 		messageView.messageText.resignFirstResponder()
-		let viewController = MCEmojiPickerViewController()
+		let viewController = EmojiPickerViewController()
 		viewController.delegate = self
 		viewController.sourceView = sender
-		viewController.isDismissAfterChoosing = false
+		viewController.isDismissedAfterChoosing = false
 		present(viewController, animated: true, completion: nil)
 	}
 	
diff --git a/Podfile b/Podfile
index a0dd5c69d..e20fff848 100644
--- a/Podfile
+++ b/Podfile
@@ -30,7 +30,7 @@ target 'linphone' do
 	pod 'DropDown'
 	pod 'IQKeyboardManager'
 	pod 'SwipeCellKit' #License: https://github.com/SwipeCellKit/SwipeCellKit/blob/develop/LICENSE
-	pod 'MCEmojiPicker' #License: https://github.com/izyumkin/MCEmojiPicker/blob/main/LICENSE
+	pod 'EmojiPicker', :git => 'https://github.com/htmlprogrammist/EmojiPicker'
 	all_pods
 
 end