diff --git a/lib/ansible/runner.py b/lib/ansible/runner.py
index 8dc5b784ea8..a9a0945feaa 100644
--- a/lib/ansible/runner.py
+++ b/lib/ansible/runner.py
@@ -275,6 +275,8 @@ class Runner(object):
             return [ utils.smjson(dict(skipped=True)), None, 'skipped' ]
 
         if self.module_name == 'setup':
+            if not args:
+                args = {}
             args = self._add_setup_vars(inject, args)
             args = self._add_setup_metadata(args)