diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/documents/ScannerLocalDocumentsUploadTimerTask.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/documents/ScannerLocalDocumentsUploadTimerTask.java
index a3cdb3357..50dbb585c 100644
--- a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/documents/ScannerLocalDocumentsUploadTimerTask.java
+++ b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/documents/ScannerLocalDocumentsUploadTimerTask.java
@@ -707,6 +707,10 @@ public void run() {
                     if(f.getName().endsWith(".uploading"))
                         continue;
                     
+                    // avoid macOS metadata files
+                    if(f.getName().toLowerCase().contains(".ds_store"))
+                        continue;
+                    
                     // avoid processing files that might still be written by the scanner
                     if((System.currentTimeMillis() - f.lastModified())<10000l)
                         continue;