diff --git a/awx/main/models/unified_jobs.py b/awx/main/models/unified_jobs.py
index c9702638e9..2a78db1719 100644
--- a/awx/main/models/unified_jobs.py
+++ b/awx/main/models/unified_jobs.py
@@ -534,9 +534,9 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
         try:
             start_args = json.loads(decrypt_field(self, 'start_args'))
         except Exception, e:
-            start_args = ''
+            start_args = None
         if start_args in (None, ''):
-            start_args = ''
+            start_args = kwargs
         opts = dict([(field, start_args.get(field, '')) for field in needed])
         if not all(opts.values()):
             missing_fields = ', '.join([k for k,v in opts.items() if not v])