diff --git a/nailgun/nailgun/test/unit/test_transactions_manager.py b/nailgun/nailgun/test/unit/test_transactions_manager.py
index 5006b0c9cb..e66682c60e 100644
--- a/nailgun/nailgun/test/unit/test_transactions_manager.py
+++ b/nailgun/nailgun/test/unit/test_transactions_manager.py
@@ -52,7 +52,7 @@ class TestMakeAstuteMessage(BaseUnitTest):
         lcm_mock.TransactionSerializer.serialize.return_value = (
             tasks_directory, tasks_graph, {}
         )
-        result = manager.make_astute_message(tx, context, graph, resolver)
+        result = manager.make_astute_message(tx, context, graph, resolver, [])
         self.assertEqual(
             {
                 'api_version': manager.settings.VERSION['api'],
diff --git a/nailgun/nailgun/transactions/manager.py b/nailgun/nailgun/transactions/manager.py
index 7be79fda87..fb4a4b4a0f 100644
--- a/nailgun/nailgun/transactions/manager.py
+++ b/nailgun/nailgun/transactions/manager.py
@@ -57,7 +57,7 @@ def _get_node_attributes(graph, kind):
     return r
 
 
-def make_astute_message(transaction, context, graph, node_resolver):
+def make_astute_message(transaction, context, graph, node_resolver, all_nodes):
     directory, tasks, metadata = lcm.TransactionSerializer.serialize(
         context, graph['tasks'], node_resolver
     )
@@ -72,6 +72,9 @@ def make_astute_message(transaction, context, graph, node_resolver):
         metadata['subgraphs'] = subgraphs
     objects.DeploymentHistoryCollection.create(transaction, tasks)
 
+    for node in all_nodes:
+        tasks.setdefault(str(node.uid), [])
+
     return {
         'api_version': settings.VERSION['api'],
         'method': 'task_deploy',
@@ -352,7 +355,7 @@ class TransactionsManager(object):
         )
         for node in nodes:
             # set progress to show that node is in progress state
-            node.progress = 1
+            node.progress = 0
             if not sub_transaction.dry_run:
                 node.error_type = None
                 node.error_msg = None
@@ -380,7 +383,7 @@ class TransactionsManager(object):
         _dump_expected_state(sub_transaction, context.new, graph['tasks'])
 
         message = make_astute_message(
-            sub_transaction, context, graph, resolver
+            sub_transaction, context, graph, resolver, nodes
         )
         objects.Transaction.on_start(sub_transaction)
         helpers.TaskHelper.create_action_log(sub_transaction)