diff --git a/src/components/Nav/Header/Link.tsx b/src/components/Nav/Header/Link.tsx
index c041c4d0..6bf639b5 100644
--- a/src/components/Nav/Header/Link.tsx
+++ b/src/components/Nav/Header/Link.tsx
@@ -17,11 +17,11 @@ type Props = {
 
 export const Link = (props: Props) => {
   const { page } = useRouter()
-  const isSelected = page().route === props.routeName
+  const isSelected = page()?.route === props.routeName
   return (
     <li
       onClick={props.onClick}
-      classList={{ 'view-switcher__item--selected': page().route === props.routeName }}
+      classList={{ 'view-switcher__item--selected': page()?.route === props.routeName }}
     >
       <ConditionalWrapper
         condition={!isSelected && Boolean(props.routeName)}
diff --git a/src/context/editor.tsx b/src/context/editor.tsx
index 5df99775..73e4bde1 100644
--- a/src/context/editor.tsx
+++ b/src/context/editor.tsx
@@ -13,6 +13,7 @@ import { slugify } from '../utils/slugify'
 
 import { useLocalize } from './localize'
 import { useSnackbar } from './snackbar'
+import { useSession } from './session'
 
 type WordCounter = {
   characters: number
@@ -82,6 +83,7 @@ const removeDraftFromLocalStorage = (shoutId: number) => {
 export const EditorProvider = (props: { children: JSX.Element }) => {
   const { t } = useLocalize()
   const { page } = useRouter()
+  const { author } = useSession()
   const { showSnackbar } = useSnackbar()
   const [isEditorPanelVisible, setIsEditorPanelVisible] = createSignal<boolean>(false)
   const editorRef: { current: () => Editor } = { current: null }
@@ -132,7 +134,7 @@ export const EditorProvider = (props: { children: JSX.Element }) => {
         lead: formToUpdate.lead,
         description: formToUpdate.description,
         cover: formToUpdate.coverImageUrl,
-        media: formToUpdate.media,
+        media: formToUpdate.media
       },
       publish,
     })