diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8edfe5a9578e..9aca5b546b8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Add `relative_url` filter to author home link [#2575](https://github.com/mmistakes/minimal-mistakes/pull/2575)
 - Fix `analytics.provider` config comment to list all analytics providers. [#2607](https://github.com/mmistakes/minimal-mistakes/pull/2607)
 - Fix typo in installation documentation. [#2570](https://github.com/mmistakes/minimal-mistakes/pull/2570)
+- Fix broken Lunr search with Jekyll v4.1.0. [#2617](https://github.com/mmistakes/minimal-mistakes/pull/2617)
 
 ### Enhancements
 
diff --git a/assets/js/lunr/lunr-en.js b/assets/js/lunr/lunr-en.js
index 5a5814f338fa..43429309faf0 100644
--- a/assets/js/lunr/lunr-en.js
+++ b/assets/js/lunr/lunr-en.js
@@ -1,5 +1,5 @@
 ---
-layout: null
+layout: none
 ---
 
 var idx = lunr(function () {
diff --git a/assets/js/lunr/lunr-gr.js b/assets/js/lunr/lunr-gr.js
index eb4daaef2394..10eb0e71cef4 100644
--- a/assets/js/lunr/lunr-gr.js
+++ b/assets/js/lunr/lunr-gr.js
@@ -1,5 +1,5 @@
 ---
-layout: null
+layout: none
 ---
 
 step1list = new Array();
diff --git a/assets/js/lunr/lunr-store.js b/assets/js/lunr/lunr-store.js
index 0f405ee92a4a..370d1448884c 100644
--- a/assets/js/lunr/lunr-store.js
+++ b/assets/js/lunr/lunr-store.js
@@ -1,5 +1,5 @@
 ---
-layout: null
+layout: none
 ---
 
 var store = [
diff --git a/docs/_docs/18-history.md b/docs/_docs/18-history.md
index bc91ae4f9c38..bd9ad3f3e43e 100644
--- a/docs/_docs/18-history.md
+++ b/docs/_docs/18-history.md
@@ -5,7 +5,7 @@ permalink: /docs/history/
 excerpt: "Change log of enhancements and bug fixes made to the theme."
 sidebar:
   nav: docs
-last_modified_at: 2020-07-23T12:13:57-04:00
+last_modified_at: 2020-07-24T00:00:00+00:00
 toc: false
 ---
 
@@ -16,6 +16,7 @@ toc: false
 - Add `relative_url` filter to author home link [#2575](https://github.com/mmistakes/minimal-mistakes/pull/2575)
 - Fix `analytics.provider` config comment to list all analytics providers. [#2607](https://github.com/mmistakes/minimal-mistakes/pull/2607)
 - Fix typo in installation documentation. [#2570](https://github.com/mmistakes/minimal-mistakes/pull/2570)
+- Fix broken Lunr search with Jekyll v4.1.0. [#2617](https://github.com/mmistakes/minimal-mistakes/pull/2617)
 
 ### Enhancements