diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7407c3647..a8b847b63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 ###Changelog
 
 ####Next Version
+*Pebble: Fix regression which freezes Gadgetbridge when disconnecting via long-press menu
+
+####Version 0.7.0
 * Read upcoming events (up to 7 days in the future). Requires READ_CALENDAR permission 
 * Fix double SMS on Sony Android and Android 6.0
 * Pebble: Support replying to SMS form the watch (canned replies)
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java
index 6d24bad33..3d0597e08 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java
@@ -367,7 +367,7 @@ public class PebbleIoThread extends GBDeviceIoThread {
                             mIsConnected = connect(gbDevice.getAddress());
                         }
                     }
-                    if (!mIsConnected) {
+                    if (!mIsConnected && !mQuit) {
                         try {
                             gbDevice.setState(GBDevice.State.WAITING_FOR_RECONNECT);
                             gbDevice.sendDeviceUpdateIntent(getContext());