diff --git a/classes/api/piwik.php b/classes/api/piwik.php
index ecd05b6..ebcdc06 100644
--- a/classes/api/piwik.php
+++ b/classes/api/piwik.php
@@ -56,7 +56,7 @@ public static function insert_tracking() {
             }
 
             if (self::should_track()) {
-                $OUTPUT->render_from_template('local_analytics/piwik', $template);
+                $CFG->additionalhtmlhead .= $OUTPUT->render_from_template('local_analytics/piwik', $template);
             }
         }
     }
diff --git a/templates/piwik.mustache b/templates/piwik.mustache
index ccb55c5..193e42b 100644
--- a/templates/piwik.mustache
+++ b/templates/piwik.mustache
@@ -32,7 +32,6 @@
     Example context (json):
     { "siteid": UA-90210-15, "addition": 2, }
 }}
-
 <!-- Start Piwik Code -->
 {{#imagetrack}}
 <noscript>
@@ -41,9 +40,7 @@
 </p>
 </noscript>
 {{/imagetrack}}
-<!-- End Piwik Code -->
-
-{{#js}}
+<script type="text/javascript">
 var _paq = _paq || [];
 {{{doctitle}}}
 {{#userid}}
@@ -59,4 +56,5 @@ _paq.push(['enableHeartBeatTimer', 30]);
   var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
 g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
 })();
-{{/js}}
\ No newline at end of file
+</script>
+<!-- End Piwik Code -->
\ No newline at end of file