diff --git a/src/lib/components/view.svelte b/src/lib/components/view.svelte
index a44b6b97..9f424131 100644
--- a/src/lib/components/view.svelte
+++ b/src/lib/components/view.svelte
@@ -3,7 +3,7 @@
 
 	import { codeStore } from '$lib/util/state';
 	import { onMount } from 'svelte';
-	import * as mermaid from 'mermaid';
+	import mermaid from 'mermaid';
 
 	let code = '';
 	let config = '';
diff --git a/src/routes/edit.svelte b/src/routes/edit.svelte
index f194d8a8..262dac1f 100644
--- a/src/routes/edit.svelte
+++ b/src/routes/edit.svelte
@@ -10,11 +10,12 @@
 	import { initHandler, syncDiagram } from '$lib/util/util';
 	import { errorStore } from '$lib/util/error';
 	import { onMount } from 'svelte';
-	import * as mermaid from 'mermaid';
+	import mermaid from 'mermaid';
 	import type monaco from 'monaco-editor';
 	import type { EditorUpdateEvent, State, Tab } from '$lib/types';
 	import { base } from '$app/paths';
 
+	base64State; // Weird fix for error > base64State is not defined. Treeshaking?
 	let selectedMode = 'code';
 	const languageMap = {
 		code: 'mermaid',