diff --git a/src/FilesSidebarTabApp.vue b/src/FilesSidebarTabApp.vue
index f1627a4ac96..5a83b4bc60e 100644
--- a/src/FilesSidebarTabApp.vue
+++ b/src/FilesSidebarTabApp.vue
@@ -20,11 +20,7 @@
 -->
 <template>
 	<div class="talkChatTab">
-		<div v-if="fileInfo && fileInfo.isDirectory()" class="emptycontent">
-			<div class="icon icon-talk" />
-			<h2>Conversations are not available for folders</h2>
-		</div>
-		<div v-else-if="isTalkSidebarSupportedForFile === undefined" class="emptycontent ui-not-ready-placeholder">
+		<div v-if="isTalkSidebarSupportedForFile === undefined" class="emptycontent ui-not-ready-placeholder">
 			<div class="icon icon-loading" />
 		</div>
 		<div v-else-if="!isTalkSidebarSupportedForFile" class="emptycontent file-not-shared">
diff --git a/src/mainChatTab.js b/src/mainChatTab.js
index 31148518e70..955ebcd6d63 100644
--- a/src/mainChatTab.js
+++ b/src/mainChatTab.js
@@ -67,4 +67,5 @@ if (!window.OCA.Talk) {
 Object.assign(window.OCA.Talk, {
 	fileInfo: null,
 	newTab,
+	store: store,
 })
diff --git a/src/mainSidebarTab.js b/src/mainSidebarTab.js
index 1fd790ba897..d5500fa634d 100644
--- a/src/mainSidebarTab.js
+++ b/src/mainSidebarTab.js
@@ -21,8 +21,28 @@
  */
 
 import FilesSidebarTab from './views/FilesSidebarTab'
+import { leaveConversation } from './services/participantsService'
+
+const isEnabled = function(fileInfo) {
+	if (fileInfo && !fileInfo.isDirectory()) {
+		return true
+	}
+
+	// If the Talk tab can not be displayed then the current conversation is
+	// left; this must be done here because "setFileInfo" will not get
+	// called with the new file if the tab can not be displayed.
+	leaveConversation(OCA.Talk.store.getters.getToken())
+
+	OCA.Talk.store.dispatch('updateTokenAndFileIdForToken', {
+		newToken: null,
+		newFileId: null,
+	})
+
+	return false
+}
+
 window.addEventListener('DOMContentLoaded', () => {
 	if (OCA.Files && OCA.Files.Sidebar) {
-		OCA.Files.Sidebar.registerTab(new OCA.Files.Sidebar.Tab('talk-chat', FilesSidebarTab))
+		OCA.Files.Sidebar.registerTab(new OCA.Files.Sidebar.Tab('talk-chat', FilesSidebarTab, isEnabled))
 	}
 })