diff --git a/messaging/rabbitmq_user.py b/messaging/rabbitmq_user.py
index 6333e42282e..b12178e08ea 100644
--- a/messaging/rabbitmq_user.py
+++ b/messaging/rabbitmq_user.py
@@ -108,7 +108,7 @@ class RabbitMqUser(object):
         self.username = username
         self.password = password
         self.node = node
-        if tags is None:
+        if not tags:
             self.tags = list()
         else:
             self.tags = tags.split(',')