diff --git a/src/lib/components/channel/PinnedMessagesModal.svelte b/src/lib/components/channel/PinnedMessagesModal.svelte
index 2d24671d6a..3e6832e005 100644
--- a/src/lib/components/channel/PinnedMessagesModal.svelte
+++ b/src/lib/components/channel/PinnedMessagesModal.svelte
@@ -37,10 +37,10 @@
 
 			if (res) {
 				pinnedMessages = [...(pinnedMessages ?? []), ...res];
-			}
 
-			if (res.length === 0) {
-				allItemsLoaded = true;
+				if (res.length === 0) {
+					allItemsLoaded = true;
+				}
 			}
 		} catch (error) {
 			console.error('Error fetching pinned messages:', error);
diff --git a/src/lib/components/channel/Thread.svelte b/src/lib/components/channel/Thread.svelte
index 5049337312..ba03f3a69f 100644
--- a/src/lib/components/channel/Thread.svelte
+++ b/src/lib/components/channel/Thread.svelte
@@ -35,7 +35,9 @@
 	}
 
 	const scrollToBottom = () => {
-		messagesContainerElement.scrollTop = messagesContainerElement.scrollHeight;
+		if (messagesContainerElement) {
+			messagesContainerElement.scrollTop = messagesContainerElement.scrollHeight;
+		}
 	};
 
 	const initHandler = async () => {