diff --git a/heka/files/encoder/es-json.toml b/heka/files/encoder/es-json.toml
index edf9c60..de86b21 100644
--- a/heka/files/encoder/es-json.toml
+++ b/heka/files/encoder/es-json.toml
@@ -1,5 +1,5 @@
 [encoder_{{ name }}]
 type = "ESJsonEncoder"
 index = "{{ values.index }}"
-es_index_from_timestamp = "{{ values.es_index_from_timestamp }}"
+es_index_from_timestamp = {{ values.es_index_from_timestamp }}
 
diff --git a/metadata/service/server/router.yml b/metadata/service/server/router.yml
index d8d66aa..98ff3ba 100644
--- a/metadata/service/server/router.yml
+++ b/metadata/service/server/router.yml
@@ -50,5 +50,5 @@
           engine: es-json
           message_matcher: TRUE
           index: logfile-%{%Y.%m.%d}
-          es_index_from_timestamp: "yes"
+          es_index_from_timestamp: true