diff --git a/client/src/models/Board.js b/client/src/models/Board.js
index 53992b36..4477be6c 100755
--- a/client/src/models/Board.js
+++ b/client/src/models/Board.js
@@ -30,11 +30,12 @@ export default class extends Model {
   static reducer({ type, payload }, Board) {
     switch (type) {
       case ActionTypes.LOCATION_CHANGE_HANDLE:
-      case ActionTypes.BOARD_FETCH__SUCCESS:
-        Board.upsert({
-          ...payload.board,
-          isFetching: false,
-        });
+        if (payload.board) {
+          Board.upsert({
+            ...payload.board,
+            isFetching: false,
+          });
+        }
 
         break;
       case ActionTypes.LOCATION_CHANGE_HANDLE__BOARD_FETCH:
@@ -130,6 +131,13 @@ export default class extends Model {
           isFetching: false,
         });
 
+        break;
+      case ActionTypes.BOARD_FETCH__SUCCESS:
+        Board.upsert({
+          ...payload.board,
+          isFetching: false,
+        });
+
         break;
       case ActionTypes.BOARD_FETCH__FAILURE:
         Board.withId(payload.id).update({