diff --git a/lib/services/remote_sync_service.dart b/lib/services/remote_sync_service.dart
index 393369086..7cc4ef733 100644
--- a/lib/services/remote_sync_service.dart
+++ b/lib/services/remote_sync_service.dart
@@ -445,7 +445,7 @@ class RemoteSyncService {
           remoteDiff.localID,
           remoteDiff.fileType,
           title: remoteDiff.title,
-          deviceFolder: remoteDiff.deviceFolder,
+          deviceFolder: remoteDiff.deviceFolder ?? '',
         );
         if (localFileEntries.isEmpty) {
           // set remote file's localID as null because corresponding local file