diff --git a/tasks/collect_config/finish/gitflow.yml b/tasks/collect_config/finish/gitflow.yml
index 64cc9c50e1d9fbfd406b1afd5330f2f98cfb62a9..ca3d1608e35210e617150cf835d84d5c16c292af 100644
--- a/tasks/collect_config/finish/gitflow.yml
+++ b/tasks/collect_config/finish/gitflow.yml
@@ -8,6 +8,7 @@
   become: false
   with_items:
     - 'flow hotfix finish -F -p -m "Config export {{ version }}" {{ version }}'
+  when: git_status.stdout != ''
 
 - name: "Delete webroot working copy"
   file: