diff --git a/redis/defaults/main.yml b/redis/defaults/main.yml
index 268bdd08..6526c887 100644
--- a/redis/defaults/main.yml
+++ b/redis/defaults/main.yml
@@ -7,7 +7,7 @@ redis_bind_interface: 127.0.0.1
 redis_unixsocket: '/var/run/redis/redis.sock'
 redis_timeout: 300
 
-redis_password: ''
+redis_password: NULL
 
 redis_loglevel: "notice"
 redis_logfile: /var/log/redis/redis-server.log
diff --git a/redis/tasks/munin.yml b/redis/tasks/munin.yml
index 75d44941..04d6449c 100644
--- a/redis/tasks/munin.yml
+++ b/redis/tasks/munin.yml
@@ -68,5 +68,5 @@
     option: env.password
     value: '{{ redis_password }}'
   notify: restart munin-node
-  when: redis_password != ''
+  when: redis_password != '' and redis_password != None
   tags: redis