diff --git a/lib/astute/server/dispatcher.rb b/lib/astute/server/dispatcher.rb
index 6b3adf96..8cc45fc3 100644
--- a/lib/astute/server/dispatcher.rb
+++ b/lib/astute/server/dispatcher.rb
@@ -92,7 +92,8 @@ module Astute
               :tasks_graph => data['args'].fetch('tasks_graph', {}),
               :tasks_directory => data['args'].fetch('tasks_directory', {}),
               :tasks_metadata => data['args'].fetch('tasks_metadata', {}),
-              :dry_run => data['args'].fetch('dry_run', false)
+              :dry_run => data['args'].fetch('dry_run', false),
+              :noop_run => data['args'].fetch('noop_run', false)
             }
           )
         rescue Timeout::Error
diff --git a/lib/astute/task_deployment.rb b/lib/astute/task_deployment.rb
index 439ba250..a6d2f42b 100644
--- a/lib/astute/task_deployment.rb
+++ b/lib/astute/task_deployment.rb
@@ -48,10 +48,7 @@ module Astute
         'fault_tolerance_groups',
         []
       )
-      cluster.noop_run = tasks_metadata.fetch(
-        'noop_run',
-        false
-      )
+      cluster.noop_run = deployment_options.fetch(:noop_run, false)
 
       cluster.node_statuses_transitions = tasks_metadata.fetch(
         'node_statuses_transitions',
diff --git a/spec/unit/task_deployment_spec.rb b/spec/unit/task_deployment_spec.rb
index 702e4e3d..015b8cd0 100644
--- a/spec/unit/task_deployment_spec.rb
+++ b/spec/unit/task_deployment_spec.rb
@@ -305,9 +305,10 @@ describe Astute::TaskDeployment do
 
         Astute::TaskCluster.any_instance.expects(:run).returns({:success => true})
         task_deployment.deploy(
-            tasks_metadata: tasks_metadata.merge({'noop_run' => true}),
+            tasks_metadata: tasks_metadata,
             tasks_graph: tasks_graph,
-            tasks_directory: tasks_directory)
+            tasks_directory: tasks_directory,
+            noop_run: true)
       end
     end