diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiMusicService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiMusicService.java
index ab91d047f..d48eb66e4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiMusicService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiMusicService.java
@@ -136,8 +136,8 @@ public class XiaomiMusicService extends AbstractXiaomiService {
             }
 
             musicInfo.setVolume(mediaManager.getPhoneVolume())
-                    .setTrack(musicSpec.track)
-                    .setArtist(musicSpec.artist)
+                    .setTrack(musicSpec.track != null ? musicSpec.track : "")
+                    .setArtist(musicSpec.artist != null ? musicSpec.artist : "")
                     .setPosition(musicStateSpec.position)
                     .setDuration(musicSpec.duration);
         }