diff --git a/app/src/main/java/com/infomaniak/drive/ui/SaveExternalFilesActivity.kt b/app/src/main/java/com/infomaniak/drive/ui/SaveExternalFilesActivity.kt
index a84a289df6..58e129bea0 100644
--- a/app/src/main/java/com/infomaniak/drive/ui/SaveExternalFilesActivity.kt
+++ b/app/src/main/java/com/infomaniak/drive/ui/SaveExternalFilesActivity.kt
@@ -280,7 +280,7 @@ class SaveExternalFilesActivity : BaseActivity() {
                             finish()
                         } else {
                             withContext(Dispatchers.Main) {
-                                binding.saveButton?.hideProgress(R.string.buttonSave)
+                                binding.saveButton.hideProgress(R.string.buttonSave)
                                 showSnackbar(R.string.errorSave)
                             }
                         }
diff --git a/app/src/main/java/com/infomaniak/drive/ui/fileList/fileShare/FileShareLinkSettingsFragment.kt b/app/src/main/java/com/infomaniak/drive/ui/fileList/fileShare/FileShareLinkSettingsFragment.kt
index 84f6badd3c..dab9ae2ba3 100644
--- a/app/src/main/java/com/infomaniak/drive/ui/fileList/fileShare/FileShareLinkSettingsFragment.kt
+++ b/app/src/main/java/com/infomaniak/drive/ui/fileList/fileShare/FileShareLinkSettingsFragment.kt
@@ -98,7 +98,7 @@ class FileShareLinkSettingsFragment : Fragment() {
     }
 
     private fun setupAddPassword() = with(binding) {
-        addPasswordSwitch?.setOnCheckedChangeListener { _, isChecked ->
+        addPasswordSwitch.setOnCheckedChangeListener { _, isChecked ->
             val actionPasswordVisible = shareLink.right == ShareLink.ShareLinkFilePermission.PASSWORD
             newPasswordButton.isVisible = actionPasswordVisible && isChecked
             passwordTextLayout.isVisible = !actionPasswordVisible && isChecked
@@ -232,7 +232,7 @@ class FileShareLinkSettingsFragment : Fragment() {
         }
         addPasswordDescription.text = getString(
             R.string.shareLinkPasswordRightDescription,
-            context?.getString(getTypeName(navigationArgs.isFolder, navigationArgs.isOnlyOfficeFile))
+            context.getString(getTypeName(navigationArgs.isFolder, navigationArgs.isOnlyOfficeFile))
         )
 
         addExpirationDateSwitch.isChecked = shareLink.validUntil != null