diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup
index 7d8d6959..91e2d766 100755
--- a/src/freedombone-utils-setup
+++ b/src/freedombone-utils-setup
@@ -622,6 +622,11 @@ function create_usb_canary {
     mark_completed $FUNCNAME
 }
 
+function remove_nfs {
+    apt-get -yq remove nfs-kernel-server
+    apt-get -yq remove nfs-common
+}
+
 function setup_firewall {
     function_check create_completion_file
     create_completion_file
@@ -692,6 +697,9 @@ function setup_utils {
     function_check proc_filesystem_settings
     proc_filesystem_settings
 
+    function_check remove_nfs
+    remove_nfs
+
     function_check optimise_filesystem
     optimise_filesystem