diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9dfd1d545..3c5870021 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -230,6 +230,7 @@
             <intent-filter>
                 <action android:name="com.andrew.apollo.metachanged" />
                 <action android:name="com.cyanogenmod.eleven.metachanged" />
+                <action android:name="com.spotify.music.metadatachanged" />
             </intent-filter>
         </receiver>
         <receiver
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/MusicPlaybackReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/MusicPlaybackReceiver.java
index 45ce6cda3..2952f7ef1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/MusicPlaybackReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/MusicPlaybackReceiver.java
@@ -3,6 +3,8 @@ package nodomain.freeyourgadget.gadgetbridge.externalevents;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -12,8 +14,23 @@ import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 public class MusicPlaybackReceiver extends BroadcastReceiver {
     private static final Logger LOG = LoggerFactory.getLogger(MusicPlaybackReceiver.class);
 
+    private static String mLastSource;
+
     @Override
     public void onReceive(Context context, Intent intent) {
+        String action = intent.getAction();
+        int lastDot = action.lastIndexOf(".");
+        String source = action.substring(0, lastDot);
+
+        if (!source.equals(mLastSource)) {
+            mLastSource = source;
+            SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+            SharedPreferences.Editor edit = sharedPrefs.edit();
+            edit.putString("last_audiosource", mLastSource);
+            LOG.info("set last audiosource to " + mLastSource);
+            edit.apply();
+        }
+
         String artist = intent.getStringExtra("artist");
         String album = intent.getStringExtra("album");
         String track = intent.getStringExtra("track");
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBMusicControlReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBMusicControlReceiver.java
index e509dca6b..3b7213447 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBMusicControlReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBMusicControlReceiver.java
@@ -3,8 +3,10 @@ package nodomain.freeyourgadget.gadgetbridge.service.receivers;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.media.AudioManager;
 import android.os.SystemClock;
+import android.preference.PreferenceManager;
 import android.view.KeyEvent;
 
 import org.slf4j.Logger;
@@ -51,16 +53,25 @@ public class GBMusicControlReceiver extends BroadcastReceiver {
         }
 
         if (keyCode != -1) {
+            SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+            String audioSource = sharedPrefs.getString("last_audiosource", null);
+
             long eventtime = SystemClock.uptimeMillis();
 
             Intent downIntent = new Intent(Intent.ACTION_MEDIA_BUTTON, null);
             KeyEvent downEvent = new KeyEvent(eventtime, eventtime, KeyEvent.ACTION_DOWN, keyCode, 0);
             downIntent.putExtra(Intent.EXTRA_KEY_EVENT, downEvent);
+            if (audioSource != null) {
+                downIntent.setPackage(audioSource);
+            }
             context.sendOrderedBroadcast(downIntent, null);
 
             Intent upIntent = new Intent(Intent.ACTION_MEDIA_BUTTON, null);
             KeyEvent upEvent = new KeyEvent(eventtime, eventtime, KeyEvent.ACTION_UP, keyCode, 0);
             upIntent.putExtra(Intent.EXTRA_KEY_EVENT, upEvent);
+            if (audioSource != null) {
+                upIntent.setPackage(audioSource);
+            }
             context.sendOrderedBroadcast(upIntent, null);
         }
     }