diff --git a/docs/_includes/masthead.html b/docs/_includes/masthead.html
index 0fdb5c38..1ef971a9 100644
--- a/docs/_includes/masthead.html
+++ b/docs/_includes/masthead.html
@@ -43,16 +43,16 @@
 <link rel="stylesheet alternate" href="{{ '/assets/css/theme2.css' | relative_url }}" id="theme_source_2">
 
 <script>
-	let theme = sessionStorage.getItem('theme');
+	let theme = localStorage.getItem('theme');
 	if (theme === "dark") {
-		sessionStorage.setItem('theme', 'dark');
+		localStorage.setItem('theme', 'dark');
 		node1 = document.getElementById('theme_source');
 		node2 = document.getElementById('theme_source_2');
 		node1.setAttribute('rel', 'stylesheet alternate');
 		node2.setAttribute('rel', 'stylesheet');
 	}
 	else {
-		sessionStorage.setItem('theme', 'light');
+		localStorage.setItem('theme', 'light');
 	}
 
 	function toggleTheme() {
@@ -61,13 +61,13 @@
 		if (node1.getAttribute("rel") == "stylesheet") {
 			node1.setAttribute("rel", "stylesheet alternate");
 			node2.setAttribute("rel", "stylesheet");
-			editor.setOption("theme", "dark");
-			sessionStorage.setItem("theme", "dark");
+			try {editor?.setOption("theme", "dark")} catch {};
+			localStorage.setItem("theme", "dark");
 		} else {
 			node2.setAttribute("rel", "stylesheet alternate");
 			node1.setAttribute("rel", "stylesheet");
-			editor.setOption("theme", "light");
-			sessionStorage.setItem("theme", "light");
+			try {editor.setOption("theme", "light")} catch {};
+			localStorage.setItem("theme", "light");
 		}
 		return false;
 	}
diff --git a/docs/_includes/repl.html b/docs/_includes/repl.html
index 984ccb3f..cb70ab9b 100644
--- a/docs/_includes/repl.html
+++ b/docs/_includes/repl.html
@@ -89,7 +89,7 @@
 <!-- CodeMirror Luau Editor (MUST BE LOADED AFTER CODEMIRROR!) -->
 <script>
 	var editor = CodeMirror.fromTextArea(document.getElementById("script"), {
-		theme: sessionStorage.getItem('theme'),
+		theme: localStorage.getItem('theme'),
 		mode: "luau",
 		matchBrackets: true,
 		lineNumbers: true,