diff --git a/lib/mcollective/util/tasks_support.rb b/lib/mcollective/util/tasks_support.rb
index 1538abdd..8e682977 100644
--- a/lib/mcollective/util/tasks_support.rb
+++ b/lib/mcollective/util/tasks_support.rb
@@ -392,6 +392,17 @@ def run_task_command(requestid, task, wait=true, callerid="local")
 
         wait_for_task_completion(requestid) if wait
 
+        # Redact inputs from choria.json
+        redacted_data = JSON.load File.open(File.join(spool, "choria.json"))
+        redacted_data["request"]["input"] = {}
+
+        File.open(File.join(spool, "choria.json"), "w") do |meta|
+          meta.print(redacted_data.to_json)
+        end
+
+        # Delete wrapper_stdin
+        File.delete(File.join(spool, "wrapper_stdin"))
+
         task_status(requestid)
       end