diff --git a/app/AppKernel.php b/app/AppKernel.php
index 78d59c1f289..de20e0800e9 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -100,7 +100,6 @@ public function registerBundles()
             new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
             new Symfony\Bundle\SecurityBundle\SecurityBundle(),
             new Symfony\Bundle\MonologBundle\MonologBundle(),
-            new Symfony\Bundle\TwigBundle\TwigBundle(),
             new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
             new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
             new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
@@ -157,6 +156,7 @@ public function registerBundles()
         }
 
         if (in_array($this->getEnvironment(), array('dev', 'test'))) {
+            $bundles[] = new Symfony\Bundle\TwigBundle\TwigBundle();
             $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
             $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
             $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
diff --git a/app/config/config.php b/app/config/config.php
index 329c40c1d3d..4259997c9de 100644
--- a/app/config/config.php
+++ b/app/config/config.php
@@ -71,7 +71,6 @@ function ($v) { return (!empty($v)); }
     ),
     'templating'           => array(
         'engines' => array(
-            'twig',
             'php'
         ),
         'form' => array(
@@ -98,12 +97,6 @@ function ($v) { return (!empty($v)); }
     )*/
 ));
 
-//Twig Configuration
-$container->loadFromExtension('twig', array(
-    'debug'                => '%kernel.debug%',
-    'strict_variables'     => '%kernel.debug%'
-));
-
 //Doctrine Configuration
 $container->loadFromExtension('doctrine', array(
     'dbal' => array(
diff --git a/app/config/config_dev.php b/app/config/config_dev.php
index bc113364ac3..2ca30acebf0 100644
--- a/app/config/config_dev.php
+++ b/app/config/config_dev.php
@@ -2,6 +2,12 @@
 $loader->import("config.php");
 $loader->import("security.php");
 
+//Twig Configuration
+$container->loadFromExtension('twig', array(
+    'debug'                => '%kernel.debug%',
+    'strict_variables'     => '%kernel.debug%'
+));
+
 $container->loadFromExtension('framework', array(
     "router"   => array(
         "resource"            => "%kernel.root_dir%/config/routing_dev.php",