diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01661a60d..1737b36f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 3.12.4
+- Fix incorrect span activation for local activities
+
 ## 3.12.3
 - Remove unused direct dependency of com.google.http-client
 - Fix context propagation bug that would link two parents in some cases
diff --git a/build.gradle b/build.gradle
index 5c19d404c..be525bbdb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,7 +44,7 @@ googleJavaFormat {
 }
 
 group = 'com.uber.cadence'
-version = '3.12.3'
+version = '3.12.4'
 
 description = '''Uber Cadence Java Client'''