diff --git a/_includes/docs-sidebar.html b/_includes/docs-sidebar.html
index 3e82a8b217..c0a0982bcc 100644
--- a/_includes/docs-sidebar.html
+++ b/_includes/docs-sidebar.html
@@ -1,5 +1,5 @@
 <form class="bd-search d-flex align-items-center">
-  <input type="search" class="form-control" id="search-input" placeholder="Search..." aria-label="Search for..." autocomplete="off" data-baseurl="{{ site.baseurl }}/docs/{{ site.docs_version }}">
+  <input type="search" class="form-control" id="search-input" placeholder="Search..." aria-label="Search for..." autocomplete="off" data-siteurl="{{ site.url }}">
   <button class="btn btn-link bd-search-docs-toggle d-md-none p-0 ml-3" type="button" data-toggle="collapse" data-target="#bd-docs-nav" aria-controls="bd-docs-nav" aria-expanded="false" aria-label="Toggle docs navigation">
     {%- include icons/menu.svg width="30" height="30" -%}
   </button>
diff --git a/assets/js/src/application.js b/assets/js/src/application.js
index 2d8b08d1d4..a35202f1df 100644
--- a/assets/js/src/application.js
+++ b/assets/js/src/application.js
@@ -115,8 +115,13 @@
         },
         transformData: function (hits) {
           return hits.map(function (hit) {
-            var baseurl = document.getElementById('search-input').getAttribute('data-baseurl')
-            hit.url = hit.url.replace('https://getbootstrap.com' + baseurl, baseurl)
+            // When in production, return the result as is,
+            // otherwise remove our url from it.
+            var siteurl = document.getElementById('search-input').getAttribute('data-siteurl')
+            var urlRE = /^https?:\/\/getbootstrap\.com/
+
+            hit.url = siteurl.match(urlRE) ? hit.url : hit.url.replace(urlRE, '')
+
             return hit
           })
         },