diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93d36b8e3..23bf8ada1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.5.8]
+
+### Fixed
+- Fixed logic issue where notifications were being disabled even when auto push registration was turned off
+
 ## [3.5.7]
 
 ### Added
diff --git a/iterableapi-ui/build.gradle b/iterableapi-ui/build.gradle
index 9bc690e3e..adf47bd7f 100644
--- a/iterableapi-ui/build.gradle
+++ b/iterableapi-ui/build.gradle
@@ -51,7 +51,7 @@ dependencies {
 
 ext {
     libraryName = 'iterableapi-ui'
-    libraryVersion = '3.5.7'
+    libraryVersion = '3.5.8'
 }
 
 if (hasProperty("mavenPublishEnabled")) {
diff --git a/iterableapi/build.gradle b/iterableapi/build.gradle
index 8d1d3d62b..d0bcfbf9c 100644
--- a/iterableapi/build.gradle
+++ b/iterableapi/build.gradle
@@ -85,7 +85,7 @@ dependencies {
 
 ext {
     libraryName = 'iterableapi'
-    libraryVersion = '3.5.7'
+    libraryVersion = '3.5.8'
 }
 
 if (hasProperty("mavenPublishEnabled")) {
diff --git a/sample-apps/inbox-customization/app/build.gradle b/sample-apps/inbox-customization/app/build.gradle
index 03f4c7d30..177b9ee54 100644
--- a/sample-apps/inbox-customization/app/build.gradle
+++ b/sample-apps/inbox-customization/app/build.gradle
@@ -33,8 +33,8 @@ dependencies {
     implementation 'androidx.navigation:navigation-ui-ktx:2.1.0'
     implementation 'com.google.android.material:material:1.1.0'
 
-    implementation 'com.iterable:iterableapi:3.5.7'
-    implementation 'com.iterable:iterableapi-ui:3.5.7'
+    implementation 'com.iterable:iterableapi:3.5.8'
+    implementation 'com.iterable:iterableapi-ui:3.5.8'
     implementation 'com.squareup.okhttp3:mockwebserver:4.2.2'
 
     testImplementation 'junit:junit:4.12'
diff --git a/sample-apps/inbox-customization/build.gradle b/sample-apps/inbox-customization/build.gradle
index 14e58012b..1b6065eb2 100644
--- a/sample-apps/inbox-customization/build.gradle
+++ b/sample-apps/inbox-customization/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.7'
+        classpath 'com.android.tools.build:gradle:3.5.8'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files