diff --git a/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java b/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java
index 6453ab5..ede8c53 100755
--- a/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java
+++ b/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java
@@ -112,9 +112,11 @@
         }
         log.info("ServletContext '" + servletContext.getRealPath("/") + "' initialized.");
         
-        if(servletContext.getInitParameter(StateUtils.INIT_SECRET) != null
-                || servletContext.getInitParameter(StateUtils.INIT_SECRET.toLowerCase()) != null)
+        String useEncryption = servletContext.getInitParameter(StateUtils.USE_ENCRYPTION);
+        if (!"false".equals(useEncryption)){ // the default value is true
             StateUtils.initSecret(servletContext);
+        }
+
     }