diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35841886..1463f40d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 _Auto-generated. Do not edit by hand._
 
+## 0.37.1
+
+### Bug Fixes
+
+**Scene History**
+
+- Fixed a crash when generating dialogue in long scenes that combine layered history with pre-established history entries. The scene could become unplayable until its layered history was manually edited.
+
 ## 0.37.0
 
 ### Upgrade Notes
diff --git a/CHANGELOG.yaml b/CHANGELOG.yaml
index 792198b3..526fa08a 100644
--- a/CHANGELOG.yaml
+++ b/CHANGELOG.yaml
@@ -1,3 +1,6 @@
+0.37.1:
+  fixes:
+  - "Scene History: Fixed a crash when generating dialogue in long scenes that combine layered history with pre-established (static) history entries. The affected scene could become unplayable until its layered history was manually edited."
 0.37.0:
   features:
   - "System Prompt Template Variable: Added {{ system_prompt }} template variable for system prompt overrides. Use it to include the default system prompt within a custom override, at both the app and client level."
diff --git a/pyproject.toml b/pyproject.toml
index 68f137b0..332979ef 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "talemate"
-version = "0.37.0"
+version = "0.37.1"
 description = "AI-backed roleplay and narrative tools"
 authors = [{name = "VeguAITools"}]
 license = {text = "GNU Affero General Public License v3.0"}
diff --git a/src/talemate/version.py b/src/talemate/version.py
index 309f4422..847d7501 100644
--- a/src/talemate/version.py
+++ b/src/talemate/version.py
@@ -1,3 +1,3 @@
 __all__ = ["VERSION"]
 
-VERSION = "0.37.0"
+VERSION = "0.37.1"
diff --git a/talemate_frontend/package.json b/talemate_frontend/package.json
index 9a279931..54bd5342 100644
--- a/talemate_frontend/package.json
+++ b/talemate_frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "talemate_frontend",
-  "version": "0.37.0",
+  "version": "0.37.1",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/talemate_frontend/src/components/WhatsNew.vue b/talemate_frontend/src/components/WhatsNew.vue
index 0cc506c0..f5a156ac 100644
--- a/talemate_frontend/src/components/WhatsNew.vue
+++ b/talemate_frontend/src/components/WhatsNew.vue
@@ -95,8 +95,20 @@ export default {
     data() {
         return {
             dialog: false,
-            selected: "0.37.0",
+            selected: "0.37.1",
             whatsNew: [
+                {
+                    version: '0.37.1',
+                    items: [
+                        {
+                            title: "Bugfix release",
+                            description: "Fixes a crash affecting some long scenes that use layered history.",
+                            items: [
+                                "Fixed a crash when generating dialogue in long scenes that combine layered history with pre-established history entries. The scene could become unplayable until its layered history was manually edited."
+                            ]
+                        }
+                    ]
+                },
                 {
                     "version": "0.37.0",
                     "items": [
diff --git a/talemate_frontend/src/constants/version.js b/talemate_frontend/src/constants/version.js
index bc8d3fd0..590858e6 100644
--- a/talemate_frontend/src/constants/version.js
+++ b/talemate_frontend/src/constants/version.js
@@ -1,4 +1,4 @@
-export const FRONTEND_VERSION = "0.37.0";
+export const FRONTEND_VERSION = "0.37.1";
 
 export function versionsMatch(backendVersion) {
   return FRONTEND_VERSION === backendVersion;
diff --git a/uv.lock b/uv.lock
index a71985ac..dc60f7db 100644
--- a/uv.lock
+++ b/uv.lock
@@ -5694,7 +5694,7 @@ wheels = [
 
 [[package]]
 name = "talemate"
-version = "0.37.0"
+version = "0.37.1"
 source = { editable = "." }
 dependencies = [
     { name = "aiofiles" },