diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
index 6fdeb39f6..36918ba92 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
@@ -741,9 +741,9 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
 
         if (bufferMusicStateSpec != stateSpec) {
             bufferMusicStateSpec = stateSpec;
+            sendMusicStateToDevice();
         }
 
-        sendMusicStateToDevice();
     }
 
     @Override
@@ -755,12 +755,11 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
 
         if (bufferMusicSpec != musicSpec) {
             bufferMusicSpec = musicSpec;
+            if (isMusicAppStarted) {
+                sendMusicStateToDevice();
+            }
         }
 
-        if (!isMusicAppStarted) {
-            return;
-        }
-        sendMusicStateToDevice();
     }