diff --git a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/Share.android.kt b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/Share.android.kt
index cf3fcbaae7..eb6ed0bbf8 100644
--- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/Share.android.kt
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/Share.android.kt
@@ -35,7 +35,12 @@ actual fun shareFile(text: String, fileSource: CryptoFile) {
     val tmpFile = File(tmpDir, fileSource.filePath)
     tmpFile.deleteOnExit()
     ChatModel.filesToDelete.add(tmpFile)
-    decryptCryptoFile(getAppFilePath(fileSource.filePath), fileSource.cryptoArgs, tmpFile.absolutePath)
+    try {
+      decryptCryptoFile(getAppFilePath(fileSource.filePath), fileSource.cryptoArgs, tmpFile.absolutePath)
+    } catch (e: Exception) {
+      Log.e(TAG, "Unable to decrypt crypto file: " + e.stackTraceToString())
+      return
+    }
     getAppFileUri(tmpFile.absolutePath)
   } else {
     getAppFileUri(fileSource.filePath)
@@ -96,15 +101,21 @@ fun saveImage(ciFile: CIFile?) {
         val outputStream = BufferedOutputStream(stream)
         if (ciFile.fileSource?.cryptoArgs != null) {
           createTmpFileAndDelete { tmpFile ->
-            decryptCryptoFile(filePath, ciFile.fileSource.cryptoArgs, tmpFile.absolutePath)
+            try {
+              decryptCryptoFile(filePath, ciFile.fileSource.cryptoArgs, tmpFile.absolutePath)
+            } catch (e: Exception) {
+              Log.e(TAG, "Unable to decrypt crypto file: " + e.stackTraceToString())
+              return@createTmpFileAndDelete
+            }
             tmpFile.inputStream().use { it.copyTo(outputStream) }
+            showToast(generalGetString(MR.strings.image_saved))
           }
           outputStream.close()
         } else {
           File(filePath).inputStream().use { it.copyTo(outputStream) }
           outputStream.close()
+          showToast(generalGetString(MR.strings.image_saved))
         }
-        showToast(generalGetString(MR.strings.image_saved))
       }
     }
   } else {
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIFileView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIFileView.kt
index 87f4aa4f31..57dcd16cb9 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIFileView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIFileView.kt
@@ -214,7 +214,13 @@ fun rememberSaveFileLauncher(ciFile: CIFile?): FileChooserLauncher =
     if (filePath != null && to != null) {
       if (ciFile?.fileSource?.cryptoArgs != null) {
         createTmpFileAndDelete { tmpFile ->
-          decryptCryptoFile(filePath, ciFile.fileSource.cryptoArgs, tmpFile.absolutePath)
+          try {
+            decryptCryptoFile(filePath, ciFile.fileSource.cryptoArgs, tmpFile.absolutePath)
+          } catch (e: Exception) {
+            Log.e(TAG, "Unable to decrypt crypto file: " + e.stackTraceToString())
+            tmpFile.delete()
+            return@createTmpFileAndDelete
+          }
           copyFileToFile(tmpFile, to) {}
           tmpFile.delete()
         }
diff --git a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/RecAndPlay.desktop.kt b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/RecAndPlay.desktop.kt
index 25fc9ec8d5..83351d7729 100644
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/RecAndPlay.desktop.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/RecAndPlay.desktop.kt
@@ -59,6 +59,7 @@ actual object AudioPlayer: AudioPlayerInterface {
         }
       }.onFailure {
         Log.e(TAG, it.stackTraceToString())
+        fileSource.deleteTmpFile()
         AlertManager.shared.showAlertMsg(generalGetString(MR.strings.unknown_error), it.message)
         return null
       }
diff --git a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/Share.desktop.kt b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/Share.desktop.kt
index 1d5ab45bbb..a91bc5a761 100644
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/Share.desktop.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/Share.desktop.kt
@@ -27,7 +27,11 @@ actual fun shareFile(text: String, fileSource: CryptoFile) {
     FileChooserLauncher(false) { to: URI? ->
       if (to != null) {
         if (fileSource.cryptoArgs != null) {
-          decryptCryptoFile(getAppFilePath(fileSource.filePath), fileSource.cryptoArgs, to.path)
+          try {
+            decryptCryptoFile(getAppFilePath(fileSource.filePath), fileSource.cryptoArgs, to.path)
+          } catch (e: Exception) {
+            Log.e(TAG, "Unable to decrypt crypto file: " + e.stackTraceToString())
+          }
         } else {
           copyFileToFile(File(fileSource.filePath), to) {}
         }
diff --git a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.desktop.kt b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.desktop.kt
index 9df5bd0a12..f602dd577c 100644
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.desktop.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.desktop.kt
@@ -48,7 +48,12 @@ actual fun copyItemToClipboard(cItem: ChatItem, clipboard: ClipboardManager) {
     val filePath: String = if (fileSource.cryptoArgs != null) {
       val tmpFile = File(tmpDir, fileSource.filePath)
       tmpFile.deleteOnExit()
-      decryptCryptoFile(getAppFilePath(fileSource.filePath), fileSource.cryptoArgs, tmpFile.absolutePath)
+      try {
+        decryptCryptoFile(getAppFilePath(fileSource.filePath), fileSource.cryptoArgs, tmpFile.absolutePath)
+      } catch (e: Exception) {
+        Log.e(TAG, "Unable to decrypt crypto file: " + e.stackTraceToString())
+        return
+      }
       tmpFile.absolutePath
     } else {
       getAppFilePath(fileSource.filePath)
diff --git a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/helpers/Utils.desktop.kt b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/helpers/Utils.desktop.kt
index e867dd1b34..7478e22a43 100644
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/helpers/Utils.desktop.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/helpers/Utils.desktop.kt
@@ -94,9 +94,14 @@ actual fun getAppFileUri(fileName: String): URI =
 actual fun getLoadedImage(file: CIFile?): Pair<ImageBitmap, ByteArray>? {
   val filePath = getLoadedFilePath(file)
   return if (filePath != null) {
-    val data = if (file?.fileSource?.cryptoArgs != null) readCryptoFile(filePath, file.fileSource.cryptoArgs) else File(filePath).readBytes()
-    val bitmap = getBitmapFromByteArray(data, false)
-    if (bitmap != null) bitmap to data else null
+    try {
+      val data = if (file?.fileSource?.cryptoArgs != null) readCryptoFile(filePath, file.fileSource.cryptoArgs) else File(filePath).readBytes()
+      val bitmap = getBitmapFromByteArray(data, false)
+      if (bitmap != null) bitmap to data else null
+    } catch (e: Exception) {
+      Log.e(TAG, "Unable to read crypto file: " + e.stackTraceToString())
+      null
+    }
   } else {
     null
   }
diff --git a/src/Simplex/Chat.hs b/src/Simplex/Chat.hs
index 291ca8be36..60e861a484 100644
--- a/src/Simplex/Chat.hs
+++ b/src/Simplex/Chat.hs
@@ -1289,7 +1289,7 @@ processChatCommand = \case
         connectionStats <- withAgent $ \a -> abortConnectionSwitch a connId
         pure $ CRGroupMemberSwitchAborted user g m connectionStats
       _ -> throwChatError CEGroupMemberNotActive
-  APISyncContactRatchet contactId force -> withUser $ \user -> do
+  APISyncContactRatchet contactId force -> withUser $ \user -> withChatLock "syncContactRatchet" $ do
     ct <- withStore $ \db -> getContact db user contactId
     case contactConnId ct of
       Just connId -> do
@@ -1297,7 +1297,7 @@ processChatCommand = \case
         createInternalChatItem user (CDDirectSnd ct) (CISndConnEvent $ SCERatchetSync rss Nothing) Nothing
         pure $ CRContactRatchetSyncStarted user ct cStats
       Nothing -> throwChatError $ CEContactNotActive ct
-  APISyncGroupMemberRatchet gId gMemberId force -> withUser $ \user -> do
+  APISyncGroupMemberRatchet gId gMemberId force -> withUser $ \user -> withChatLock "syncGroupMemberRatchet" $ do
     (g, m) <- withStore $ \db -> (,) <$> getGroupInfo db user gId <*> getGroupMember db user gId gMemberId
     case memberConnId m of
       Just connId -> do