diff --git a/ansible/hypsipyla.yml b/ansible/hypsipyla.yml
index 261f564f6aaffd717ede9560aa0f8157ec97b865..dcdb5d296f362e4c8ef1bde28d84b3879bab4a03 100644
--- a/ansible/hypsipyla.yml
+++ b/ansible/hypsipyla.yml
@@ -255,14 +255,22 @@
         recursive: true
       become: true
       become_user: fja
+      register: fjaweb_update
 
     - name: "enable & start fjaweb socket"
       systemd:
         name: "fjaweb.socket"
-        state: 'started' # database generation can break the current instance
+        state: 'started'
         enabled: true
         daemon_reload: '{{fjaweb_service_file.changed}}'
 
+    - name: "Stop fjaweb service if it was updated, socket will bring it up"
+      systemd:
+        name: "fjaweb.service"
+        state: 'stopped'
+        enabled: false
+      when: '{{fjaweb_update.changed}}'
+
     - name: "install nginx & co"
       apt:
         pkg: