diff --git a/messaging/rabbitmq_queue.py b/messaging/rabbitmq_queue.py
index bcc08f046a5..105104b3d77 100644
--- a/messaging/rabbitmq_queue.py
+++ b/messaging/rabbitmq_queue.py
@@ -82,28 +82,34 @@ options:
         description:
             - How long a message can live in queue before it is discarded (milliseconds)
         required: False
+        default: forever
     auto_expires:
         description:
             - How long a queue can be unused before it is automatically deleted (milliseconds)
         required: false
+        default: forever
     max_length:
         description:
             - How many messages can the queue contain before it starts rejecting
         required: false
+        default: no limit
     dead_letter_exchange:
         description:
             - Optional name of an exchange to which messages will be republished if they
             - are rejected or expire
         required: false
+        default: None
     dead_letter_routing_key:
         description:
             - Optional replacement routing key to use when a message is dead-lettered.
             - Original routing key will be used if unset
         required: false
+        default: None
     arguments:
         description:
             - extra arguments for queue. If defined this argument is a key/value dictionary
-        required: false        
+        required: false
+        default: {}
 '''
 
 EXAMPLES = '''