diff --git a/src/src/app/components/add-to-page-modal/add-to-page-modal.component.ts b/src/src/app/components/add-to-page-modal/add-to-page-modal.component.ts
index 35c711c3..b0b92b32 100644
--- a/src/src/app/components/add-to-page-modal/add-to-page-modal.component.ts
+++ b/src/src/app/components/add-to-page-modal/add-to-page-modal.component.ts
@@ -13,7 +13,7 @@ import { CardItem } from '../../models/card-state';
 export class AddToPageModalComponent {
   form: FormGroup;
   title: string;
-  pages$ = this.appService.select((state) => state.savedPages);
+  pages$ = this.appService.select((state) => (state.savedPages === null ? null : state.savedPages.value));
 
   @ViewChild('pageList')
   pageList: MatSelectionList;
diff --git a/src/src/app/services/app-state-reducer.ts b/src/src/app/services/app-state-reducer.ts
index 08eb366b..60ef08e4 100644
--- a/src/src/app/services/app-state-reducer.ts
+++ b/src/src/app/services/app-state-reducer.ts
@@ -178,7 +178,7 @@ export function reducer(state: AppState, action: AppAction): AppState {
     }
     case 'SAVE_PAGE': {
       const savedPages = new Storable([
-        ...state.savedPages.value,
+        ...(state.savedPages ? state.savedPages.value : []),
         {
           // create a new saved page object
           title: action.title,
@@ -216,7 +216,7 @@ export function reducer(state: AppState, action: AppAction): AppState {
     }
     case 'ADD_CARD_TO_SAVED_PAGE': {
       const savedPages = new Storable([
-        ...state.savedPages.value.map((o) => {
+        ...(state.savedPages ? state.savedPages.value : []).map((o) => {
           if (o.id.toString() === action.pageId) {
             let cards = [] as CardItem[];
             if (state.settings.value.displaySettings.appendCardToBottom) {
@@ -294,7 +294,7 @@ export function reducer(state: AppState, action: AppAction): AppState {
       const savedPages =
         state.currentSavedPage !== null
           ? new Storable(
-              state.savedPages.value.map((o) => {
+              (state.savedPages ? state.savedPages.value : []).map((o) => {
                 if (o === state.currentSavedPage) {
                   return currentSavedPage;
                 }
@@ -415,7 +415,7 @@ export function reducer(state: AppState, action: AppAction): AppState {
       ]);
 
       const savedPages = new Storable<SavedPage[]>([
-        ...state.savedPages.value.map((sp) => {
+        ...(state.savedPages ? state.savedPages.value : []).map((sp) => {
           return {
             ...sp,
             queries: sp.queries.map((o) => {
@@ -457,7 +457,7 @@ export function reducer(state: AppState, action: AppAction): AppState {
       const notes = new Storable<NoteItem[]>([...state.notes.value.filter((o) => o.id !== action.note.id)]);
 
       const savedPages = new Storable<SavedPage[]>([
-        ...state.savedPages.value.map((sp) => {
+        ...(state.savedPages ? state.savedPages.value : []).map((sp) => {
           return {
             ...sp,
             queries: sp.queries.filter((o) => {