diff --git a/salt/states/loop.py b/salt/states/loop.py
index edaf8c306371..db4971ceb0fe 100644
--- a/salt/states/loop.py
+++ b/salt/states/loop.py
@@ -94,6 +94,10 @@ def until(name,
         ret['comment'] = 'The execution module {0} will be run'.format(name)
         ret['result'] = None
         return ret
+    if not m_args:
+        m_args = []
+    if not m_kwargs:
+        m_kwargs = {}
 
     def timed_out():
         if time.time() >= timeout: