diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppSupport.java
index f30b4473d..79c09725b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppSupport.java
@@ -272,15 +272,12 @@ public class XiaomiSppSupport extends XiaomiConnectionSupport {
             payload = mXiaomiSupport.getAuthService().decrypt(payload);
         }
 
-        int channel = packet.getChannel();
-        if (mChannelHandlers.containsKey(channel)) {
-            XiaomiChannelHandler handler = mChannelHandlers.get(channel);
-
-            if (handler != null)
-                handler.handle(payload);
+        final XiaomiChannelHandler handler = mChannelHandlers.get(packet.getChannel());
+        if (handler != null) {
+            handler.handle(payload);
+        } else {
+            LOG.warn("Unhandled SppPacket on channel {}", packet.getChannel());
         }
-
-        LOG.warn("Unhandled SppPacket on channel {}", packet.getChannel());
     }
 
     @Override