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 cfdd1e850..533469e5f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesActivity.java
@@ -80,6 +80,8 @@ public class ActivitySummariesActivity extends AbstractListActivity<BaseActivity
                     String gpxTrack = summary.getGpxTrack();
                     if (gpxTrack != null) {
                         showTrack(gpxTrack);
+                    } else {
+                        GB.toast("This activity does not contain GPX tracks.", Toast.LENGTH_LONG, GB.INFO);
                     }
                 }
             }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/ActivityTrackExporter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/ActivityTrackExporter.java
index 914fcc666..692f64aba 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/ActivityTrackExporter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/ActivityTrackExporter.java
@@ -11,5 +11,8 @@ public interface ActivityTrackExporter {
     @NonNull
     String getDefaultFileName(@NonNull ActivityTrack track);
 
-    void performExport(ActivityTrack track, File targetFile) throws IOException;
+    void performExport(ActivityTrack track, File targetFile) throws IOException, GPXTrackEmptyException;
+
+    class GPXTrackEmptyException extends Exception {
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/GPXExporter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/GPXExporter.java
index 5ae0ba746..e11c328ea 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/GPXExporter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/GPXExporter.java
@@ -39,7 +39,7 @@ public class GPXExporter implements ActivityTrackExporter {
     }
 
     @Override
-    public void performExport(ActivityTrack track, File targetFile) throws IOException {
+    public void performExport(ActivityTrack track, File targetFile) throws IOException, GPXTrackEmptyException {
         String encoding = StandardCharsets.UTF_8.name();
         XmlSerializer ser = Xml.newSerializer();
         try {
@@ -80,14 +80,19 @@ public class GPXExporter implements ActivityTrackExporter {
         return DateTimeUtils.formatIso8601(date);
     }
 
-    private void exportTrack(XmlSerializer ser, ActivityTrack track) throws IOException {
+    private void exportTrack(XmlSerializer ser, ActivityTrack track) throws IOException, GPXTrackEmptyException {
         ser.startTag(NS_DEFAULT, "trk");
         ser.startTag(NS_DEFAULT, "trkseg");
 
         List<ActivityPoint> trackPoints = track.getTrackPoints();
         String source = getSource(track);
+        boolean atLeastOnePointExported = false;
         for (ActivityPoint point : trackPoints) {
-            exportTrackPoint(ser, point, source);
+            atLeastOnePointExported = exportTrackPoint(ser, point, source) | atLeastOnePointExported ;
+        }
+
+        if(!atLeastOnePointExported) {
+            throw new GPXTrackEmptyException();
         }
 
         ser.endTag(NS_DEFAULT, "trkseg");
@@ -98,10 +103,10 @@ public class GPXExporter implements ActivityTrackExporter {
         return track.getDevice().getName();
     }
 
-    private void exportTrackPoint(XmlSerializer ser, ActivityPoint point, String source) throws IOException {
+    private boolean exportTrackPoint(XmlSerializer ser, ActivityPoint point, String source) throws IOException {
         GPSCoordinate location = point.getLocation();
         if (location == null) {
-            return; // skip invalid points, that just contain hr data, for example
+            return false; // skip invalid points, that just contain hr data, for example
         }
         ser.startTag(NS_DEFAULT, "trkpt");
         ser.attribute(NS_DEFAULT, "lon", formatLocation(location.getLongitude()));
@@ -117,6 +122,8 @@ public class GPXExporter implements ActivityTrackExporter {
         exportTrackpointExtensions(ser, point);
 
         ser.endTag(NS_DEFAULT, "trkpt");
+
+        return true;
     }
 
     private void exportTrackpointExtensions(XmlSerializer ser, ActivityPoint point) throws IOException {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/FetchSportsDetailsOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/FetchSportsDetailsOperation.java
index 2d0d450aa..b32a221ae 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/FetchSportsDetailsOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/FetchSportsDetailsOperation.java
@@ -100,12 +100,18 @@ public class FetchSportsDetailsOperation extends AbstractFetchOperation {
                 ActivityTrackExporter exporter = createExporter();
                 String fileName = FileUtils.makeValidFileName("gadgetbridge-track-" + DateTimeUtils.formatIso8601(summary.getStartTime()));
                 File targetFile = new File(FileUtils.getExternalFilesDir(), fileName);
-                exporter.performExport(track, targetFile);
 
-                try (DBHandler dbHandler = GBApplication.acquireDB()) {
-                    summary.setGpxTrack(targetFile.getAbsolutePath());
-                    dbHandler.getDaoSession().getBaseActivitySummaryDao().update(summary);
+                try {
+                    exporter.performExport(track, targetFile);
+
+                    try (DBHandler dbHandler = GBApplication.acquireDB()) {
+                        summary.setGpxTrack(targetFile.getAbsolutePath());
+                        dbHandler.getDaoSession().getBaseActivitySummaryDao().update(summary);
+                    }
+                } catch (ActivityTrackExporter.GPXTrackEmptyException ex) {
+                    GB.toast(getContext(), "This activity does not contain GPX tracks.", Toast.LENGTH_LONG, GB.ERROR, ex);
                 }
+
                 GregorianCalendar endTime = BLETypeConversions.createCalendar();
                 endTime.setTime(summary.getEndTime());
                 saveLastSyncTimestamp(endTime);