diff --git a/lib/Files/TemplateLoader.php b/lib/Files/TemplateLoader.php
index d6a2c96f3f9..ca0770a2309 100644
--- a/lib/Files/TemplateLoader.php
+++ b/lib/Files/TemplateLoader.php
@@ -88,10 +88,14 @@ public function handle(Event $event): void {
 			return;
 		}
 
+		$user = $this->userSession->getUser();
+		if ($user instanceof IUser && $this->talkConfig->isDisabledForUser($user)) {
+			return;
+		}
+
 		Util::addStyle(Application::APP_ID, 'merged-files');
 		Util::addScript(Application::APP_ID, 'talk-files-sidebar');
 
-		$user = $this->userSession->getUser();
 		if ($user instanceof IUser) {
 			$this->publishInitialStateForUser($user, $this->rootFolder, $this->appManager);
 		} else {
diff --git a/src/PublicShareSidebar.vue b/src/PublicShareSidebar.vue
index dc6c70cda95..fa89749780f 100644
--- a/src/PublicShareSidebar.vue
+++ b/src/PublicShareSidebar.vue
@@ -49,6 +49,7 @@
 
 <script>
 import PreventUnload from 'vue-prevent-unload'
+import { showError } from '@nextcloud/dialogs'
 import { loadState } from '@nextcloud/initial-state'
 import CallView from './components/CallView/CallView'
 import ChatView from './components/ChatView'
@@ -147,9 +148,19 @@ export default {
 
 			this.joiningConversation = true
 
-			await this.getPublicShareConversationData()
+			try {
+				await this.getPublicShareConversationData()
+
+				await this.$store.dispatch('joinConversation', { token: this.token })
+			} catch (exception) {
+				this.joiningConversation = false
+
+				showError(t('spreed', 'Error occurred when joining the conversation'))
 
-			await this.$store.dispatch('joinConversation', { token: this.token })
+				console.error(exception)
+
+				return
+			}
 
 			// No need to wait for it, but fetching the conversation needs to be
 			// done once the user has joined the conversation (otherwise only