diff --git a/etc/nextcloudpi-config.d/samba.sh b/etc/nextcloudpi-config.d/samba.sh
index 8e7bd7301..e8dc0256b 100644
--- a/etc/nextcloudpi-config.d/samba.sh
+++ b/etc/nextcloudpi-config.d/samba.sh
@@ -27,6 +27,9 @@ install()
 
   # the directory needs to be recreated if we are using nc-ramlogs
   grep -q mkdir /etc/init.d/smbd || sed -i "/\<start)/amkdir -p /var/log/samba" /etc/init.d/smbd
+
+  # disable SMB1 and SMB2
+  grep -q SMB3 /etc/samba/smb.conf || sed -i '/\[global\]/aprotocol = SMB3' /etc/samba/smb.conf
 }
 
 show_info()
diff --git a/update.sh b/update.sh
index 0aca4fdd2..0fd3460a9 100755
--- a/update.sh
+++ b/update.sh
@@ -111,6 +111,9 @@ EOF
   # remove default config file in stretch
   rm -f /etc/apt/apt.conf.d/20auto-upgrades
 
+  # disable SMB1 and SMB2
+  grep -q SMB3 /etc/samba/smb.conf || sed -i '/\[global\]/aprotocol = SMB3' /etc/samba/smb.conf
+
   # restart PHP to get updates in the ncp-web
   # FIXME: php doesn't come up if run from ncp-web
   #(