diff --git a/roles/common/tasks/samba-install.yml b/roles/common/tasks/samba-install.yml
index 5f92a56..d2f3bfc 100644
--- a/roles/common/tasks/samba-install.yml
+++ b/roles/common/tasks/samba-install.yml
@@ -29,6 +29,20 @@
     - samba-server
     - samba-virusfilter
 
+- name: (samba-install.yml) Ensure clamav-daemon and clamav-freshclam services are enabled
+  service:
+    name: "{{ item }}"
+    enabled: yes
+  loop:
+    - clamav-daemon
+    - clamav-freshclam
+  when:
+    - "groups['samba_server']|string is search(inventory_hostname)"
+    - samba_shares | selectattr('vfs_object_virusfilter', 'defined') | selectattr('vfs_object_virusfilter', 'equalto', true) | list | length > 0
+  tags:
+    - samba-server
+    - samba-virusfilter
+
 - name: (samba-install.yml) Ensure quarantine directory exists
   file:
     path: /data/samba/QUARANTINE