diff --git a/src/lib/components/chat/Chat.svelte b/src/lib/components/chat/Chat.svelte
index e95263dae..48acf8d3f 100644
--- a/src/lib/components/chat/Chat.svelte
+++ b/src/lib/components/chat/Chat.svelte
@@ -289,7 +289,11 @@
 			if (controlPane && !$mobile) {
 				try {
 					if (value) {
-						controlPane.resize(parseInt(localStorage.getItem('chat-controls-size') || '35'));
+						controlPane.resize(
+							parseInt(localStorage.getItem('chat-controls-size') || '35')
+								? parseInt(localStorage.getItem('chat-controls-size') || '35')
+								: 35
+						);
 					} else {
 						controlPane.resize(0);
 					}
diff --git a/src/lib/components/chat/ChatControls.svelte b/src/lib/components/chat/ChatControls.svelte
index 9e958f89b..aae0bc573 100644
--- a/src/lib/components/chat/ChatControls.svelte
+++ b/src/lib/components/chat/ChatControls.svelte
@@ -40,6 +40,7 @@
 				largeScreen = true;
 			} else {
 				largeScreen = false;
+				pane = null;
 			}
 		};
 
@@ -121,7 +122,11 @@
 		</PaneResizer>
 		<Pane
 			bind:pane
-			defaultSize={$showControls ? parseInt(localStorage.getItem('chat-controls-size') || '35') : 0}
+			defaultSize={$showControls
+				? parseInt(localStorage.getItem('chat-controls-size') || '35')
+					? parseInt(localStorage.getItem('chat-controls-size') || '35')
+					: 35
+				: 0}
 			onResize={(size) => {
 				if (size === 0) {
 					showControls.set(false);