diff --git a/heka/files/encoder/es_payload.toml b/heka/files/encoder/es-payload.toml
similarity index 88%
rename from heka/files/encoder/es_payload.toml
rename to heka/files/encoder/es-payload.toml
index e3fd314..31d78cf 100644
--- a/heka/files/encoder/es_payload.toml
+++ b/heka/files/encoder/es-payload.toml
@@ -1,5 +1,5 @@
 [es_payload]
-type = "ESJsonEncoder"
+type = "SandboxEncoder"
 filename = "lua_encoders/es_payload.lua"
 
     [es_payload.config]
diff --git a/metadata/service/server/amqp/router.yml b/metadata/service/server/amqp/router.yml
index 6f55f4d..f163365 100644
--- a/metadata/service/server/amqp/router.yml
+++ b/metadata/service/server/amqp/router.yml
@@ -50,3 +50,5 @@
           engine: es-json
           index: logfile-%{%Y.%m.%d}
           es_index_from_timestamp: true
+        es_payload:
+          engine: es-payload