diff --git a/website/api/controllers/docs/view-basic-documentation.js b/website/api/controllers/docs/view-basic-documentation.js
index 487bc70c14..1e2fc94ddd 100644
--- a/website/api/controllers/docs/view-basic-documentation.js
+++ b/website/api/controllers/docs/view-basic-documentation.js
@@ -75,7 +75,8 @@ module.exports = {
         thisPage.meta.description ? thisPage.meta.description // « custom meta description for this page, if provided in markdown
         : 'Documentation for Fleet for osquery.'// « otherwise use the generic description
       ),
-      showSwagForm
+      showSwagForm,
+      algoliaPublicKey: sails.config.custom.algoliaPublicKey,
     };
 
   }
diff --git a/website/api/controllers/handbook/view-basic-handbook.js b/website/api/controllers/handbook/view-basic-handbook.js
index 2a05af2ab4..a790b8141a 100644
--- a/website/api/controllers/handbook/view-basic-handbook.js
+++ b/website/api/controllers/handbook/view-basic-handbook.js
@@ -69,6 +69,7 @@ module.exports = {
         thisPage.meta.description ? thisPage.meta.description // « custom meta description for this page, if provided in markdown
         : 'View the Fleet handbook.'// « otherwise use a generic description
       ),
+      algoliaPublicKey: sails.config.custom.algoliaPublicKey,
     };
 
   }
diff --git a/website/assets/js/pages/docs/basic-documentation.page.js b/website/assets/js/pages/docs/basic-documentation.page.js
index 97f3b064d7..e8a86cec6b 100644
--- a/website/assets/js/pages/docs/basic-documentation.page.js
+++ b/website/assets/js/pages/docs/basic-documentation.page.js
@@ -82,16 +82,18 @@ parasails.registerPage('basic-documentation', {
 
   mounted: async function() {
     // Algolia DocSearch
-    docsearch({
-      appId: 'NZXAYZXDGH',
-      apiKey: 'f3c02b646222734376a5e94408d6fead',
-      indexName: 'fleetdm',
-      inputSelector: (this.isDocsLandingPage ? '#docsearch-query-landing' : '#docsearch-query'),
-      debug: false,
-      algoliaOptions: {
-        'facetFilters': ['section:docs']
-      },
-    });
+    if(this.algoliaPublicKey) { // Note: Docsearch will only be enabled if sails.config.custom.algoliaPublicKey is set. If the value is undefined, the documentation search will be disabled.
+      docsearch({
+        appId: 'NZXAYZXDGH',
+        apiKey: this.algoliaPublicKey,
+        indexName: 'fleetdm',
+        inputSelector: (this.isDocsLandingPage ? '#docsearch-query-landing' : '#docsearch-query'),
+        debug: false,
+        algoliaOptions: {
+          'facetFilters': ['section:docs']
+        },
+      });
+    }
 
     // Handle hashes in urls when coming from an external page.
     if(window.location.hash){
diff --git a/website/assets/js/pages/handbook/basic-handbook.page.js b/website/assets/js/pages/handbook/basic-handbook.page.js
index b10057e8bf..07b072a4d0 100644
--- a/website/assets/js/pages/handbook/basic-handbook.page.js
+++ b/website/assets/js/pages/handbook/basic-handbook.page.js
@@ -25,17 +25,19 @@ parasails.registerPage('basic-handbook', {
   mounted: async function() {
 
     // Algolia DocSearch
-    docsearch({
-      appId: 'NZXAYZXDGH',
-      apiKey: 'f3c02b646222734376a5e94408d6fead',
-      indexName: 'fleetdm',
-      inputSelector: '#docsearch-query',
-      debug: false,
-      clickAnalytics: true,
-      algoliaOptions: {
-        facetFilters: ['section:handbook']
-      },
-    });
+    if(this.algoliaPublicKey) {// Note: Docsearch will only be enabled if sails.config.custom.algoliaPublicKey is set. If the value is undefined, the handbook search will be disabled.
+      docsearch({
+        appId: 'NZXAYZXDGH',
+        apiKey: this.algoliaPublicKey,
+        indexName: 'fleetdm',
+        inputSelector: '#docsearch-query',
+        debug: false,
+        clickAnalytics: true,
+        algoliaOptions: {
+          facetFilters: ['section:handbook']
+        },
+      });
+    }
 
     // Handle hashes in urls when coming from an external page.
     if(window.location.hash){
diff --git a/website/assets/styles/pages/docs/basic-documentation.less b/website/assets/styles/pages/docs/basic-documentation.less
index c6d8f8088c..79782dde1c 100644
--- a/website/assets/styles/pages/docs/basic-documentation.less
+++ b/website/assets/styles/pages/docs/basic-documentation.less
@@ -97,6 +97,9 @@
       height: 100%;
       width: 98%;
     }
+    .docsearch-input:focus-visible {
+      outline: none;
+    }
 
     .ds-input:focus {
       outline: rgba(0, 0, 0, 0);
diff --git a/website/assets/styles/pages/handbook/basic-handbook.less b/website/assets/styles/pages/handbook/basic-handbook.less
index c876f605e0..7a83a1213d 100644
--- a/website/assets/styles/pages/handbook/basic-handbook.less
+++ b/website/assets/styles/pages/handbook/basic-handbook.less
@@ -35,6 +35,9 @@
       height: 100%;
       width: 98%;
     }
+    .docsearch-input:focus-visible {
+      outline: none;
+    }
     .ds-input:focus {
       outline: rgba(0, 0, 0, 0);
     }