diff --git a/client/components/boards/boardBody.jade b/client/components/boards/boardBody.jade
index 017d0b0a9..7a811dbb3 100644
--- a/client/components/boards/boardBody.jade
+++ b/client/components/boards/boardBody.jade
@@ -7,7 +7,8 @@ template(name="board")
         +boardBody
     else
       //- XXX We need a better error message in case the board has been archived
-      +message(label="board-not-found")
+      //+message(label="board-not-found")
+      {{goHome}}
   else
     +spinner
 
diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js
index dc5e0edea..e9b9f88ad 100644
--- a/client/components/boards/boardBody.js
+++ b/client/components/boards/boardBody.js
@@ -27,6 +27,10 @@ BlazeComponent.extendComponent({
     return Utils.isMiniScreen() && Session.get('currentCard');
   },
 
+  goHome() {
+    FlowRouter.go('home');
+  },
+
 }).register('board');
 
 BlazeComponent.extendComponent({