diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/TangemPayChangePinModel.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/TangemPayChangePinModel.kt
index b1d77aa35f..4194b5f69d 100644
--- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/TangemPayChangePinModel.kt
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/TangemPayChangePinModel.kt
@@ -61,6 +61,8 @@ internal class TangemPayChangePinModel @Inject constructor(
                 ).getOrNull()
             } catch (e: Exception) {
                 TangemLogger.e("Error", e)
+                uiState.update { it.copy(submitButtonLoading = false) }
+                uiMessageSender.send(message = ToastMessage(resourceReference(R.string.common_unknown_error)))
                 return@launch
             }
             uiState.update { it.copy(submitButtonLoading = false) }
@@ -77,7 +79,7 @@ internal class TangemPayChangePinModel @Inject constructor(
                 SetPinResult.DECRYPTION_ERROR,
                 SetPinResult.UNKNOWN_ERROR,
                 null,
-                -> Unit // TODO: [REDACTED_TASK_KEY] - add error handling once the requirements arrive
+                -> uiMessageSender.send(message = ToastMessage(resourceReference(R.string.common_unknown_error)))
             }
         }
     }