diff --git a/roles/matrix-base/tasks/setup_matrix_base.yml b/roles/matrix-base/tasks/setup_matrix_base.yml
index 5c45323e5..cdde09d28 100644
--- a/roles/matrix-base/tasks/setup_matrix_base.yml
+++ b/roles/matrix-base/tasks/setup_matrix_base.yml
@@ -20,6 +20,7 @@
   when: "matrix_vars_yml_snapshotting_enabled | bool"
 
 - name: Save current git-repo status on the target to aid with restoring in case of problems
+  when: "matrix_playbook_commit_hash_preservation_enabled|bool"
   block:
     - name: Get local git hash
       delegate_to: 127.0.0.1
@@ -63,8 +64,6 @@
           You can disable saving the GIT hash by setting 'matrix_playbook_commit_hash_preservation_enabled: false' in vars.yml
       when: "git_describe.stderr.find('git: not found') == -1"
 
-  when: "matrix_playbook_commit_hash_preservation_enabled|bool"
-
 - name: Ensure Matrix network is created in Docker
   community.docker.docker_network:
     name: "{{ matrix_docker_network }}"