diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd7e74f9..f1307a85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
 * webapps/nextcloud: added check that nexctcloud uid is over 3000
 * ProFTPd: set missing default listen IP for SFTP
 * apache: fix MaxRequestsPerChild value to be sync with wiki.e.o
+* ssl: no not execute haproxy tasks and reload if haproxy is disabled
 
 ### Removed
 
diff --git a/ssl/tasks/main.yml b/ssl/tasks/main.yml
index 01398dec..cc092c84 100644
--- a/ssl/tasks/main.yml
+++ b/ssl/tasks/main.yml
@@ -39,5 +39,12 @@
   tags:
     - ssl
 
+- name: Collect facts about system services
+  service_facts:
+
 - ansible.builtin.include: haproxy.yml
-  when: haproxy_check.rc == 0
+  when:
+    - haproxy_check.rc == 0
+    - ansible_facts.services['haproxy.service']['state'] == "running"
+    - ansible_facts.services['haproxy.service']['status'] == "enabled"
+