diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/FileSyncServiceHandler.kt b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/FileSyncServiceHandler.kt
index 7515a5cbfc..e07a333713 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/FileSyncServiceHandler.kt
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/FileSyncServiceHandler.kt
@@ -174,6 +174,16 @@ class FileSyncServiceHandler(val deviceSupport: GarminSupport) {
             "FIT_TYPE_49", // SLEEP
             "FIT_TYPE_61", // ECG
             "FIT_TYPE_73", // SKIN_TEMP
+            // #5824 - We need to sync some files we don't handle, to prevent the watches
+            // from starting to have issues / run out of memory
+            "FIT_TYPE_58", // DEVICE_58
+            "FIT_TYPE_79", // SLP_DISR
+            "ErrorShutdownReports", // ERROR_SHUTDOWN_REPORTS
+            "FIT_TYPE_38", // SCORE
+            "FIT_TYPE_70", // HSA
+            "FIT_TYPE_71", // COM_ACT
+            "FIT_TYPE_82", // AREA_COURSES
+            "FIT_TYPE_35", // SEGMENT_LIST
         )
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/FileTransferHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/FileTransferHandler.java
index 886c17ac07..34b3e4e4fc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/FileTransferHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/FileTransferHandler.java
@@ -70,6 +70,16 @@ public class FileTransferHandler implements MessageHandler {
         add(FileType.FILETYPE.HRV_STATUS);
         add(FileType.FILETYPE.SLEEP);
         add(FileType.FILETYPE.SKIN_TEMP);
+        // #5824 - We need to sync some files we don't handle, to prevent the watches
+        // from starting to have issues / run out of memory
+        add(FileType.FILETYPE.DEVICE_58);
+        add(FileType.FILETYPE.SLP_DISR);
+        add(FileType.FILETYPE.ERROR_SHUTDOWN_REPORTS);
+        add(FileType.FILETYPE.SCORE);
+        add(FileType.FILETYPE.HSA);
+        add(FileType.FILETYPE.COM_ACT);
+        add(FileType.FILETYPE.AREA_COURSES);
+        add(FileType.FILETYPE.SEGMENT_LIST);
     }};
 
     public FileTransferHandler(GarminSupport deviceSupport) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/FileType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/FileType.java
index 7d27e50a30..3a0a9150bf 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/FileType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/FileType.java
@@ -87,6 +87,8 @@ public class FileType {
         FBT_PTD_BACKUP(128, 74),
         SCHEDULE(128, 77),
         SLP_DISR(128, 79),
+        AREA_COURSES(128, 82), // #5824
+        GEAR(128, 87), // #5824
 
         // Other files
         DOWNLOAD_COURSE(255, 4),