diff --git a/flextype/twig/EmitterTwigExtension.php b/flextype/twig/EmitterTwigExtension.php
index 25f63cff..1a0ad1a7 100644
--- a/flextype/twig/EmitterTwigExtension.php
+++ b/flextype/twig/EmitterTwigExtension.php
@@ -33,7 +33,7 @@ class EmitterTwigExtension extends Twig_Extension implements Twig_Extension_Glob
     public function getGlobals()
     {
         return [
-            'emmiter' => new EmitterTwig($this->flextype),
+            'emitter' => new EmitterTwig($this->flextype),
         ];
     }
 }
@@ -56,7 +56,7 @@ class EmitterTwig
     /**
      * Emitting event
      */
-    public function emmit($event)
+    public function emit($event)
     {
         return $this->flextype['emitter']->emit($event);
     }
diff --git a/site/themes/default/templates/partials/base.html b/site/themes/default/templates/partials/base.html
index c268e162..b2262419 100644
--- a/site/themes/default/templates/partials/base.html
+++ b/site/themes/default/templates/partials/base.html
@@ -9,7 +9,7 @@
             <meta name="robots" content="{% if entry.robots %}{{ entry.robots }}{% else %}{{ registry.settings.robots }}{% endif %}">
             <meta name="generator" content="Powered by Flextype {{ FLEXTYPE_VERSION }}" />
 
-            {{ emitter.emit('onThemeMeta') }}
+            {% do emitter.emit('onThemeMeta') %}
 
             <title>{% if entry.title %}{{ entry.title|e('html') }} | {% endif %}{{ registry.settings.title|e('html') }}</title>
 
@@ -23,7 +23,7 @@
                 {% endfor %}
             {% endfor %}
 
-            {{ emitter.emit('onThemeHeader') }}
+            {% do emitter.emit('onThemeHeader') %}
             {{ snippets.exec('google-analytics')|raw }}
         {% endblock %}
     </head>
@@ -88,6 +88,6 @@
         }
         </script>
 
-        {{ emitter.emit('onThemeTail') }}
+        {% do emitter.emit('onThemeTail') %}
     </body>
 </html>