diff --git a/ui/src/boardList.ts b/ui/src/boardList.ts
index a7f45da..7651cd7 100644
--- a/ui/src/boardList.ts
+++ b/ui/src/boardList.ts
@@ -49,7 +49,7 @@ export class BoardList {
             board => board.workspace.tip
             )
         console.log("boardData2:main")
-        return alwaysSubscribed(pipe(joinAsync([board, latestState, tip]), ([board, latestState, tip]) => {console.log("boardData2:pipe"); return {board,latestState, tip: tip.entryHash}}))
+        return alwaysSubscribed(pipe(joinAsync([board, latestState, tip]), ([board, latestState, tip]) => {return {board,latestState, tip: tip ? tip.entryHash: undefined}}))
     })
 
 
diff --git a/ui/src/store.ts b/ui/src/store.ts
index ebc1855..4e6b095 100644
--- a/ui/src/store.ts
+++ b/ui/src/store.ts
@@ -87,7 +87,7 @@ export class KanDoStore {
             }
             if (board != undefined) {
                 this.unsub = board.workspace.tip.subscribe((tip)=>{
-                    if (tip.status == "complete") {
+                    if (tip.status == "complete" && tip.value) {
                         this.updateSeenTip(board.hash, tip.value.entryHash)
                     }
                 })