diff --git a/tasks/keycloak-install.yml b/tasks/keycloak-install.yml
index f34fbf3..06ecfa2 100644
--- a/tasks/keycloak-install.yml
+++ b/tasks/keycloak-install.yml
@@ -43,11 +43,6 @@
       mode: 0750
     tags: [ keycloak, keycloak_data_dir ]
 
-  - name Check if the avatars directory exists.
-    stat:
-      path: '{{ keycloak_external_avatar_dir }}'
-    register: avatar_dir_creation
-
   - name: Avatar directory
     ansible.builtin.file:
       dest: '{{ keycloak_external_avatar_dir }}'
@@ -55,6 +50,6 @@
       owner: '{{ keycloak_user }}'
       group: '{{ keycloak_user }}'
       mode: 0750
-    when: avatar_dir_creation.stat.isdir is not defined
+    when: not keycloak_external_avatar_dir_enabled
 
   tags: keycloak