diff --git a/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageData.kt b/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageData.kt
index 1bd44fb0b..6b0b29baf 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageData.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageData.kt
@@ -76,7 +76,7 @@ class ChatMessageData(
                 Log.i("[Chat Message] File transfer done")
                 updateContentsList()
 
-                if (!message.isEphemeral && corePreferences.makePublicMediaFilesDownloaded) {
+                if (!message.isEphemeral && !corePreferences.vfsEnabled && corePreferences.makePublicMediaFilesDownloaded) {
                     if (Version.sdkAboveOrEqual(Version.API29_ANDROID_10) || PermissionHelper.get().hasWriteExternalStorage()) {
                         for (content in message.contents) {
                             if (content.isFile && content.filePath != null && content.userData == null) {
diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AdvancedSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AdvancedSettingsViewModel.kt
index f273c0fba..c0deb5393 100644
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AdvancedSettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AdvancedSettingsViewModel.kt
@@ -108,7 +108,11 @@ class AdvancedSettingsViewModel : GenericSettingsViewModel() {
     val vfsListener = object : SettingListenerStub() {
         override fun onBoolValueChanged(newValue: Boolean) {
             prefs.vfsEnabled = newValue
-            if (newValue) CoreContext.activateVFS()
+            if (newValue) {
+                CoreContext.activateVFS()
+                // Don't do that when VFS is enabled
+                prefs.makePublicMediaFilesDownloaded = false
+            }
         }
     }
     val vfs = MutableLiveData<Boolean>()
diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ChatSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ChatSettingsViewModel.kt
index a2bc186bf..f6ff2d28b 100644
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ChatSettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ChatSettingsViewModel.kt
@@ -118,6 +118,8 @@ class ChatSettingsViewModel : GenericSettingsViewModel() {
     }
     val goToAndroidNotificationSettingsEvent = MutableLiveData<Event<Boolean>>()
 
+    val vfs = MutableLiveData<Boolean>()
+
     init {
         markAsReadNotifDismissal.value = prefs.markAsReadUponChatMessageNotificationDismissal
         downloadedMediaPublic.value = prefs.makePublicMediaFilesDownloaded
@@ -127,6 +129,7 @@ class ChatSettingsViewModel : GenericSettingsViewModel() {
         hideEmptyRooms.value = prefs.hideEmptyRooms
         hideRoomsRemovedProxies.value = prefs.hideRoomsFromRemovedProxies
         fileSharingUrl.value = core.fileTransferServer
+        vfs.value = prefs.vfsEnabled
     }
 
     private fun initAutoDownloadList() {
diff --git a/app/src/main/res/layout/settings_chat_fragment.xml b/app/src/main/res/layout/settings_chat_fragment.xml
index b3a6aefd8..ad591c875 100644
--- a/app/src/main/res/layout/settings_chat_fragment.xml
+++ b/app/src/main/res/layout/settings_chat_fragment.xml
@@ -93,7 +93,7 @@
                 <include
                     layout="@layout/settings_widget_switch"
                     linphone:title="@{@string/chat_settings_downloaded_media_public_title}"
-                    linphone:enabled="@{viewModel.autoDownloadIndex == 0}"
+                    linphone:enabled="@{viewModel.autoDownloadIndex == 0 &amp;&amp; !viewModel.vfs}"
                     linphone:subtitle="@{@string/chat_settings_downloaded_media_public_summary}"
                     linphone:listener="@{viewModel.downloadedMediaPublicListener}"
                     linphone:checked="@={viewModel.downloadedMediaPublic}"/>