diff --git a/defaults/main.yml b/defaults/main.yml
index 6764563..fa6a87f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -13,8 +13,6 @@ postgresql_group: postgres
 postgresql_unix_socket_directories:
   - /var/run/postgresql
 
-# postgresql_unix_socket_directories_mode: '02775'
-
 postgresql_service_state: started
 postgresql_service_enabled: true
 
diff --git a/tasks/configure.yml b/tasks/configure.yml
index 993a3af..bcbc0fb 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -24,7 +24,5 @@
     state: directory
     owner: "{{ postgresql_user }}"
     group: "{{ postgresql_group }}"
-    mode: "{{ postgresql_unix_socket_directories_mode
-        |default(__postgresql_unix_socket_directories_mode
-        |default('02775')) }}"
+    mode: "{{ postgresql_unix_socket_directories_mode }}"
   with_items: "{{ postgresql_unix_socket_directories }}"
diff --git a/tasks/variables.yml b/tasks/variables.yml
index 7f45154..c7b95cd 100644
--- a/tasks/variables.yml
+++ b/tasks/variables.yml
@@ -43,3 +43,9 @@
   set_fact:
     postgresql_config_path: "{{ __postgresql_config_path }}"
   when: postgresql_config_path is not defined
+
+- name: Define postgresql_unix_socket_directories_mode.
+  set_fact:
+    postgresql_unix_socket_directories_mode: >-
+      {{ __postgresql_unix_socket_directories_mode | default('02775')) }}
+  when: postgresql_unix_socket_directories_mode is not defined