diff --git a/docs/client/links.js b/docs/client/links.js
index de7f59f54b..1add3b9710 100644
--- a/docs/client/links.js
+++ b/docs/client/links.js
@@ -1,5 +1,5 @@
 var ignoreUrlChange = false;
-var ignoreWaypoints = false;
+var ignoreWaypoints = true;
 
 var deHash = function (hashString) {
   return hashString.slice(1);
@@ -70,6 +70,7 @@ Tracker.autorun(function () {
     } else {
       window.location.replace("#/basic/");
     }
+    return;
   }
 
   Tracker.afterFlush(function () {