diff --git a/src/Archive/Redirect.coffee b/src/Archive/Redirect.coffee
index 707fd55e6..38f9a9394 100755
--- a/src/Archive/Redirect.coffee
+++ b/src/Archive/Redirect.coffee
@@ -27,7 +27,7 @@ Redirect =
   archives: `<%= JSON.stringify(grunt.file.readJSON('src/Archive/archives.json')) %>`
 
   to: (dest, data) ->
-    archive = (if dest is 'search' or 'board' then Redirect.data.thread else Redirect.data[dest])[data.boardID]
+    archive = (if dest in ['search', 'board'] then Redirect.data.thread else Redirect.data[dest])[data.boardID]
     return '' unless archive
     Redirect[dest] archive, data
 
diff --git a/src/General/Header.coffee b/src/General/Header.coffee
index 17b127f14..f4c14fa1b 100755
--- a/src/General/Header.coffee
+++ b/src/General/Header.coffee
@@ -208,9 +208,8 @@ Header =
             a.href = CatalogLinks[m[1]] board
             $.addClass a, 'catalog' if m[1] is 'catalog'
 
-          if /-archive/.test t
-            a.href = Redirect.to 'board',
-              boardID: board
+          if /-archive/.test(t) and href = Redirect.to 'board', {boardID: board}
+            a.href = href
 
           $.addClass a, 'navSmall' if board is '@'
           return a