diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesActivity.java
index a9a0345c4..cfdd1e850 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesActivity.java
@@ -1,7 +1,11 @@
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
+import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.os.Bundle;
+import android.support.v4.content.LocalBroadcastManager;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.view.ContextMenu;
 import android.view.MenuItem;
@@ -10,6 +14,7 @@ import android.widget.AdapterView;
 import android.widget.Toast;
 
 import java.io.IOException;
+import java.util.Objects;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.R;
@@ -28,6 +33,28 @@ public class ActivitySummariesActivity extends AbstractListActivity<BaseActivity
     private GBDevice mGBDevice;
     private SwipeRefreshLayout swipeLayout;
 
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            switch (Objects.requireNonNull(action)) {
+                case GBDevice.ACTION_DEVICE_CHANGED:
+                    GBDevice device = intent.getParcelableExtra(GBDevice.EXTRA_DEVICE);
+                    mGBDevice = device;
+                    if (device.isBusy()) {
+                        swipeLayout.setRefreshing(true);
+                    } else {
+                        boolean wasBusy = swipeLayout.isRefreshing();
+                        swipeLayout.setRefreshing(false);
+                        if (wasBusy) {
+                            refresh();
+                        }
+                    }
+                    break;
+            }
+        }
+    };
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         Bundle extras = getIntent().getExtras();
@@ -37,6 +64,10 @@ public class ActivitySummariesActivity extends AbstractListActivity<BaseActivity
             throw new IllegalArgumentException("Must provide a device when invoking this activity");
         }
 
+        IntentFilter filterLocal = new IntentFilter();
+        filterLocal.addAction(GBDevice.ACTION_DEVICE_CHANGED);
+        LocalBroadcastManager.getInstance(this).registerReceiver(mReceiver, filterLocal);
+
         super.onCreate(savedInstanceState);
         setItemAdapter(new ActivitySummariesAdapter(this));
 
@@ -54,7 +85,6 @@ public class ActivitySummariesActivity extends AbstractListActivity<BaseActivity
             }
         });
 
-
         getItemListView().setOnCreateContextMenuListener(new View.OnCreateContextMenuListener() {
             @Override
             public void onCreateContextMenu(ContextMenu menu, View v, final ContextMenu.ContextMenuInfo menuInfo) {
@@ -85,6 +115,12 @@ public class ActivitySummariesActivity extends AbstractListActivity<BaseActivity
         });
     }
 
+    @Override
+    protected void onDestroy() {
+        LocalBroadcastManager.getInstance(this).unregisterReceiver(mReceiver);
+        super.onDestroy();
+    }
+
     private void deleteItemAt(int position) {
         BaseActivitySummary item = getItemAdapter().getItem(position);
         if (item != null) {
@@ -101,12 +137,15 @@ public class ActivitySummariesActivity extends AbstractListActivity<BaseActivity
             GB.toast(this, "Unable to display GPX track: " + e.getMessage(), Toast.LENGTH_LONG, GB.ERROR, e);
         }
     }
+
     private void fetchTrackData() {
-        if (mGBDevice.isInitialized()) {
+        if (mGBDevice.isInitialized() && !mGBDevice.isBusy()) {
             GBApplication.deviceService().onFetchRecordedData(RecordedDataTypes.TYPE_GPS_TRACKS);
         } else {
             swipeLayout.setRefreshing(false);
-            GB.toast(this, getString(R.string.device_not_connected), Toast.LENGTH_SHORT, GB.ERROR);
+            if (!mGBDevice.isInitialized()) {
+                GB.toast(this, getString(R.string.device_not_connected), Toast.LENGTH_SHORT, GB.ERROR);
+            }
         }
     }
 }