diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0cddc8b..7029524 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 When considering version compatibility (and thus incrementing the major version), we only consider the configuration file major user experience changes. The host IDE version is not considered a version compatibility factor (since otherwise we'd have to increase the major version pretty often and that would make no sense).
 
+## [1.5.1] - 2024-09-19
+### Fixed
+- [#421: Publish Action Triggers Undo Command](https://github.com/ForNeVeR/AvaloniaRider/issues/421).
+
 ## [1.5.0] - 2024-09-01
 ### Changed
 - **(Requirement update!)** Update the minimally supported Rider version to 2024.2.
@@ -105,4 +109,5 @@ The initial plugin release. The plugin provides the following features for JetBr
 [1.3.2]: https://github.com/ForNeVeR/AvaloniaRider/compare/v1.3.1...v1.3.2
 [1.4.0]: https://github.com/ForNeVeR/AvaloniaRider/compare/v1.3.2...v1.4.0
 [1.5.0]: https://github.com/ForNeVeR/AvaloniaRider/compare/v1.4.0...v1.5.0
-[Unreleased]: https://github.com/ForNeVeR/AvaloniaRider/compare/v1.5.0...HEAD
+[1.5.1]: https://github.com/ForNeVeR/AvaloniaRider/compare/v1.5.0...v1.5.1
+[Unreleased]: https://github.com/ForNeVeR/AvaloniaRider/compare/v1.5.1...HEAD
diff --git a/gradle.properties b/gradle.properties
index c003fa8..c390bde 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 kotlin.stdlib.default.dependency=false
 
-pluginVersionBase=1.5.0
+pluginVersionBase=1.5.1
 
 untilBuildVersion=243.*
 
diff --git a/src/rider/main/kotlin/me/fornever/avaloniarider/previewer/AvaloniaPreviewerSessionController.kt b/src/rider/main/kotlin/me/fornever/avaloniarider/previewer/AvaloniaPreviewerSessionController.kt
index 99a6749..557f906 100644
--- a/src/rider/main/kotlin/me/fornever/avaloniarider/previewer/AvaloniaPreviewerSessionController.kt
+++ b/src/rider/main/kotlin/me/fornever/avaloniarider/previewer/AvaloniaPreviewerSessionController.kt
@@ -2,12 +2,10 @@ package me.fornever.avaloniarider.previewer
 
 import com.intellij.execution.ui.ConsoleView
 import com.intellij.openapi.application.EDT
-import com.intellij.openapi.command.WriteCommandAction
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.diagnostic.debug
 import com.intellij.openapi.fileEditor.FileDocumentManager
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.util.Computable
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.platform.backend.workspace.WorkspaceModel
 import com.intellij.ui.scale.JBUIScale
@@ -124,10 +122,8 @@ class AvaloniaPreviewerSessionController(
 
     private val inFlightUpdate = Property(false)
 
-    private var _session: AvaloniaPreviewerSession? = null
-    private var session: AvaloniaPreviewerSession?
-        get() = application.runReadAction(Computable { _session })
-        set(value) = WriteCommandAction.runWriteCommandAction(project) { _session = value }
+    @Volatile
+    private var session: AvaloniaPreviewerSession? = null
 
     private val sessionLifetimeSource = SequentialLifetimes(controllerLifetime)
     private var currentSessionLifetime: LifetimeDefinition? = null