diff --git a/website2/website/siteConfig.js b/website2/website/siteConfig.js
index 9651231ef43..e8fa9c9da3c 100644
--- a/website2/website/siteConfig.js
+++ b/website2/website/siteConfig.js
@@ -110,7 +110,8 @@ const siteConfig = {
   // Add custom scripts here that would be placed in <script> tags.
   scripts: [
     'https://buttons.github.io/buttons.js',
-    `${baseUrl}js/custom.js`
+    `${baseUrl}js/custom.js`,
+    `${baseUrl}js/fix-location.js`
   ],
 
   // On page navigation for the current documentation page.
diff --git a/website2/website/static/js/fix-location.js b/website2/website/static/js/fix-location.js
new file mode 100644
index 00000000000..3afb4300fcf
--- /dev/null
+++ b/website2/website/static/js/fix-location.js
@@ -0,0 +1,3 @@
+if (window && window.location && window.location.pathname.endsWith('/') && window.location.pathname !== '/') {
+  window.history.replaceState('', '', window.location.pathname.substr(0, window.location.pathname.length - 1))
+}