diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0962c09..cceae3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 # Axon Framework plugin Changelog
 
+## [0.8.5]
+- Fix StackOverflow issue when aggregate model is recursive (https://github.com/AxonFramework/IdeaPlugin/issues/261)
+
 ## [0.8.4]
 - Plugin is now compatible with IDEA 2023.3 (IDEA 233.*) (Thanks to @maartenn)
 
diff --git a/gradle.properties b/gradle.properties
index c155a5d..ea086d6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,7 +19,7 @@
 
 pluginGroup=io.axoniq.ide.intellij
 pluginName=Axon Framework
-pluginVersion=0.8.4
+pluginVersion=0.8.5
 axonVersion=4.9.0
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html