diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9264f7164..36915e781 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ### Changelog
 
-#### Version 0.40.0 (WIP)
+#### Version 0.40.0
 * Fossil Q Hybrid: Initial support
 * Bangle.js: Initial support
 * Reserve Alarm for Calendar feature restricted to Mi Band 1/2 and moved to per-device settings
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
index 5066df6fc..a66528b49 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
@@ -287,7 +287,7 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
                 return START_NOT_STICKY;
             }
 
-            if (mDeviceSupport == null || (!isInitialized() && !mDeviceSupport.useAutoConnect())) {
+            if (mDeviceSupport == null || (!isInitialized() && !action.equals(ACTION_DISCONNECT) && (!mDeviceSupport.useAutoConnect() || isConnected()))) {
                 // trying to send notification without valid Bluetooth connection
                 if (mGBDevice != null) {
                     // at least send back the current device state
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 238225a81..719e4508c 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="0.40.0" versioncode="163">
+        <change>Fossil Q Hybrid: Initial support</change>
+        <change>Bangle.js: Initial support</change>
+        <change>Reserve Alarm for Calendar feature restricted to Mi Band 1/2 and moved to per-device settings</change>
+        <change>New icon for App Manager</change>
+    </release>
     <release version="0.39.1" versioncode="162">
         <change>Try to actively re-connect when a connection gets interrupted (interval grows up to 64 seconds)</change>
         <change>Mi Band2/Amazfip Bip: Make button action settings per-device and enable for Amazfit Bip</change>
diff --git a/fastlane/metadata/android/en-US/changelogs/163.txt b/fastlane/metadata/android/en-US/changelogs/163.txt
new file mode 100644
index 000000000..cbf180728
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/163.txt
@@ -0,0 +1,4 @@
+* Fossil Q Hybrid: Initial support
+* Bangle.js: Initial support
+* Reserve Alarm for Calendar feature restricted to Mi Band 1/2 and moved to per-device settings
+* New icon for App Manager