diff --git a/lib/farmbot/bot_state/bot_state.ex b/lib/farmbot/bot_state/bot_state.ex
index f30a3ad8..ad6d27e7 100644
--- a/lib/farmbot/bot_state/bot_state.ex
+++ b/lib/farmbot/bot_state/bot_state.ex
@@ -193,8 +193,8 @@ defmodule Farmbot.BotState do
 
   @doc "Emit an AST."
   def emit(%AST{} = ast) do
-    kind = Module.split(ast.kind) |> List.last |> Macro.underscore()
-    GenStage.call(__MODULE__, {:emit, %{ast | kind: kind}})
+    # kind = Module.split(ast.kind) |> List.last |> Macro.underscore()
+    GenStage.call(__MODULE__, {:emit, ast})
   end
 
   @doc "Get user env."
diff --git a/lib/farmbot/bot_state/transport/amqp/amqp.ex b/lib/farmbot/bot_state/transport/amqp/amqp.ex
index bf7c2829..7164e68a 100644
--- a/lib/farmbot/bot_state/transport/amqp/amqp.ex
+++ b/lib/farmbot/bot_state/transport/amqp/amqp.ex
@@ -148,8 +148,11 @@ defmodule Farmbot.BotState.Transport.AMQP do
   end
 
   defp emit_cs(chan, bot, cs) do
-    json = Poison.encode!(cs)
-    :ok = AMQP.Basic.publish chan, @exchange, "bot.#{bot}.from_device", json
+    with {:ok, map} <- Farmbot.CeleryScript.AST.encode(cs),
+         {:ok, json} <- Poison.encode(map)
+    do
+      :ok = AMQP.Basic.publish chan, @exchange, "bot.#{bot}.from_device", json
+    end
   end
 
   defp push_bot_state(chan, bot, state) do