diff --git a/roles/debian/clamav/handlers/main.yml b/roles/debian/clamav/handlers/main.yml
new file mode 100644
index 000000000..869d011fd
--- /dev/null
+++ b/roles/debian/clamav/handlers/main.yml
@@ -0,0 +1,9 @@
+- name: Restart clamav-daemon.socket
+  ansible.builtin.service:
+    name: clamav-daemon.socket
+    state: restarted
+    enabled: true
+
+- name: Reload systemd
+  ansible.builtin.command: systemctl daemon-reload
+  become: true
diff --git a/roles/debian/clamav/tasks/main.yml b/roles/debian/clamav/tasks/main.yml
index eeaf31013..7989190da 100644
--- a/roles/debian/clamav/tasks/main.yml
+++ b/roles/debian/clamav/tasks/main.yml
@@ -41,3 +41,13 @@
     pkg: clamdscan
     state: present
   when: clamav.install_clamdscan
+
+- name: Clamav daemon socket overrides
+  ansible.builtin.template:
+    src: clamav-daemon.socket.j2
+    dest: /etc/systemd/system/clamav-daemon.socket
+    mode: '0644'
+  when: clamav_daemon_enabled
+  notify:
+    - reload systemd
+    - restart clamav-daemon.socket
diff --git a/roles/debian/clamav/templates/clamav-daemon.socket.j2 b/roles/debian/clamav/templates/clamav-daemon.socket.j2
new file mode 100644
index 000000000..7d188ff85
--- /dev/null
+++ b/roles/debian/clamav/templates/clamav-daemon.socket.j2
@@ -0,0 +1,16 @@
+[Unit]
+Description=Socket for Clam AntiVirus userspace daemon
+Documentation=man:clamd(8) man:clamd.conf(5) https://docs.clamav.net/
+# Check for database existence
+ConditionPathExistsGlob=/var/lib/clamav/main.{c[vl]d,inc}
+ConditionPathExistsGlob=/var/lib/clamav/daily.{c[vl]d,inc}
+
+[Socket]
+ListenStream=/run/clamav/clamd.ctl
+ListenStream=3310
+SocketUser=clamav
+SocketGroup=clamav
+RemoveOnStop=True
+
+[Install]
+WantedBy=sockets.target