diff --git a/name.abuchen.portfolio/src/name/abuchen/portfolio/model/ClientFactory.java b/name.abuchen.portfolio/src/name/abuchen/portfolio/model/ClientFactory.java
index d46839aaeb..a5689375c8 100644
--- a/name.abuchen.portfolio/src/name/abuchen/portfolio/model/ClientFactory.java
+++ b/name.abuchen.portfolio/src/name/abuchen/portfolio/model/ClientFactory.java
@@ -59,6 +59,7 @@
 import javax.crypto.spec.SecretKeySpec;
 
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Platform;
 
 import com.google.common.base.Strings;
 import com.thoughtworks.xstream.XStream;
@@ -618,7 +619,12 @@ private static void writeFile(final Client client, final File file, char[] passw
             // garbling up the files if it already starts syncing while the file
             // is still being written)
             FileChannel channel = stream.getChannel();
-            FileLock lock = channel.tryLock();
+            FileLock lock = null;
+            
+            // On OS X fcntl does not support locking files on AFP or SMB
+            // https://bugs.openjdk.org/browse/JDK-8167023
+            if (!Platform.getOS().equals(Platform.OS_MACOSX))
+                lock = channel.tryLock();
 
             ClientPersister persister = buildPersister(flags, password);
             persister.save(client, output);