diff --git a/CHANGELOG.md b/CHANGELOG.md
index c49c853..595a81d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+ - Remove template debug placeholders, it breaks generated javascript
+
 ## [3.2.1] - 2020-09-02
 
 ### Fixed
diff --git a/src/MapProvider.php b/src/MapProvider.php
index adf6504..c60dc6e 100644
--- a/src/MapProvider.php
+++ b/src/MapProvider.php
@@ -385,11 +385,15 @@ class MapProvider
         ];
 
         $content = $this->templateEngine->render($templateReference, $parameters);
-        $event   = new GetJavascriptEvent($definition, $content);
+        $content = preg_replace(
+            ['/^<!-- TEMPLATE (START): .+ -->\n*/', '/\n*<!-- TEMPLATE (END): .+ -->$/'],
+            '',
+            $content
+        );
+
+        $event = new GetJavascriptEvent($definition, $content);
         $this->eventDispatcher->dispatch($event::NAME, $event);
 
-        $buffer = $event->getJavascript();
-
-        return $buffer;
+        return $event->getJavascript();
     }
 }