diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup
index c988cc83..4f30149b 100755
--- a/src/freedombone-utils-setup
+++ b/src/freedombone-utils-setup
@@ -352,6 +352,15 @@ function upgrade_installation {
     echo ''
 }
 
+function disable_nfs_insecure_locks {
+    apt-get -yq install nfs-kernel-server
+    if grep 'insecure_locks' /etc/exports; then
+        sed -i 's|,insecure_locks||g' /etc/exports
+        sed -i 's|insecure_locks,||g' /etc/exports
+        exportfs -a
+    fi
+}
+
 function setup_firewall {
     function_check create_completion_file
     create_completion_file
@@ -379,6 +388,9 @@ function setup_utils {
     function_check remove_bluetooth
     remove_bluetooth
 
+    function_check disable_nfs_insecure_locks
+    disable_nfs_insecure_locks
+
     function_check turn_off_rsys_logging
     turn_off_rsys_logging