diff --git a/plinth/modules/samba/__init__.py b/plinth/modules/samba/__init__.py
index 6a4c9e910..58c83640d 100644
--- a/plinth/modules/samba/__init__.py
+++ b/plinth/modules/samba/__init__.py
@@ -41,7 +41,7 @@ class SambaApp(app_module.App):
 
     app_id = 'samba'
 
-    _version = 5
+    _version = 6
 
     def __init__(self) -> None:
         """Create components for the app."""
diff --git a/plinth/modules/samba/privileged.py b/plinth/modules/samba/privileged.py
index 77664adc0..6c6e18786 100644
--- a/plinth/modules/samba/privileged.py
+++ b/plinth/modules/samba/privileged.py
@@ -291,6 +291,8 @@ def setup():
         action_utils.service_stop('nmbd')
     action_utils.service_disable('nmbd')
     action_utils.service_mask('nmbd')
+    action_utils.service_disable('nmb')
+    action_utils.service_mask('nmb')
 
     if action_utils.service_is_running('smbd'):
         action_utils.service_restart('smbd')