diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/Settings.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/Settings.java
index 0db5ddbef..cdddb35ce 100644
--- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/Settings.java
+++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/Settings.java
@@ -61,7 +61,7 @@ public class Settings implements PersistentStateComponent<Settings> {
     public boolean codeFoldingTwigConstant = true;
     public boolean featureTwigIcon = true;
 
-    public boolean twigBundleNamespaceSupport = true;
+    public boolean twigBundleNamespaceSupport = false;
 
     public boolean dismissEnableNotification = false;
 
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/TwigSettingsForm.form b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/TwigSettingsForm.form
index 430650a1d..33df0d50f 100644
--- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/TwigSettingsForm.form
+++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/TwigSettingsForm.form
@@ -60,7 +60,7 @@
                 <properties>
                   <selected value="true"/>
                   <text value="Support Bundle Namespaces"/>
-                  <toolTipText value="Example: Foobar:Bar:Foo.html.twig"/>
+                  <toolTipText value="Example: Foobar:Bar:Foo.html.twig (for older Symfony Versions)"/>
                 </properties>
               </component>
             </children>