diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/Configuration.java b/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/Configuration.java
index 1406a9fff..69d1e1c66 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/Configuration.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/Configuration.java
@@ -75,6 +75,8 @@ public class Configuration extends BaseEntity {
 
     private String companyLogoURL;
 
+    private Boolean scenariosVisible;
+
     public void setDefaultCalendar(BaseCalendar defaultCalendar) {
         this.defaultCalendar = defaultCalendar;
     }
@@ -198,6 +200,14 @@ public class Configuration extends BaseEntity {
         this.monteCarloMethodTabVisible = monteCarloMethodTabVisible;
     }
 
+    public Boolean isScenariosVisible() {
+        return scenariosVisible;
+    }
+
+    public void setScenariosVisible(Boolean scenariosVisible) {
+        this.scenariosVisible = scenariosVisible;
+    }
+
     public void setGenerateCodeForBaseCalendars(
             Boolean generateCodeForBaseCalendars) {
         this.generateCodeForBaseCalendars = generateCodeForBaseCalendars;
diff --git a/navalplanner-business/src/main/resources/db.changelog-initial.xml b/navalplanner-business/src/main/resources/db.changelog-initial.xml
index a2885a16d..2accda525 100644
--- a/navalplanner-business/src/main/resources/db.changelog-initial.xml
+++ b/navalplanner-business/src/main/resources/db.changelog-initial.xml
@@ -13,7 +13,6 @@
 
     </changeSet>
 
-
     <changeSet id="add-company-logo-url-configuration-setting" author="ltilve">
         <comment>Add new column with configuration setting</comment>
         <addColumn tableName="configuration">
@@ -39,6 +38,15 @@
         <renameColumn tableName="task_milestone"
             oldColumnName="start_constraint_type"
             newColumnName="constraint_type" columnDataType="INTEGER" />
+	</changeSet>
+
+    <changeSet id="add-scenarios-enabled-configuration-setting" author="ltilve">
+        <comment>Add new column with scenarios visibility flag</comment>
+        <addColumn tableName="configuration">
+            <column name="scenarios_visible" type="BOOLEAN" />
+        </addColumn>
+		<addDefaultValue tableName="configuration" columnName="scenarios_visible"
+            defaultValueBoolean="FALSE" />
     </changeSet>
 
 </databaseChangeLog>
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/common/entities/Configuration.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/common/entities/Configuration.hbm.xml
index a182f4ed6..3bd3322ea 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/common/entities/Configuration.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/common/entities/Configuration.hbm.xml
@@ -56,6 +56,9 @@
 
         <property name="companyLogoURL" column="company_logo_url" />
 
+        <property name="scenariosVisible" not-null="true"
+            column="scenarios_visible" />
+
     </class>
 
 </hibernate-mapping>
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
index 284538b85..9dbb78b4c 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
@@ -411,6 +411,14 @@ public class ConfigurationController extends GenericForwardComposer {
         return configurationModel.isMonteCarloMethodTabVisible();
     }
 
+    public void setScenariosVisible(Boolean scenariosVisible) {
+        configurationModel.setScenariosVisible(scenariosVisible);
+    }
+
+    public Boolean isScenariosVisible() {
+        return configurationModel.isScenariosVisible();
+    }
+
     public class EntitySequenceGroupRenderer implements RowRenderer {
         @Override
         public void render(Row row, Object data) throws Exception {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java
index 2ecdb4582..bc357c94f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java
@@ -548,4 +548,14 @@ public class ConfigurationModel implements IConfigurationModel {
         configuration.setCompanyLogoURL(companyLogoURL);
     }
 
+    @Override
+    public Boolean isScenariosVisible() {
+        return configuration.isScenariosVisible();
+    }
+
+    @Override
+    public void setScenariosVisible(Boolean scenariosVisible) {
+        configuration.setScenariosVisible(scenariosVisible);
+    }
+
 }
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/IConfigurationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/IConfigurationModel.java
index ef3878d55..7437b4307 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/IConfigurationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/IConfigurationModel.java
@@ -137,4 +137,8 @@ public interface IConfigurationModel {
 
     void setCompanyLogoURL(String companyLogoURL);
 
+    Boolean isScenariosVisible();
+
+    void setScenariosVisible(Boolean scenariosVisible);
+
 }
diff --git a/navalplanner-webapp/src/main/webapp/common/configuration.zul b/navalplanner-webapp/src/main/webapp/common/configuration.zul
index cad0184c4..1ccfdb388 100644
--- a/navalplanner-webapp/src/main/webapp/common/configuration.zul
+++ b/navalplanner-webapp/src/main/webapp/common/configuration.zul
@@ -181,6 +181,11 @@
                                                 label="${i18n:_('MonteCarlo method')}"
                                                 checked="@{configurationController.monteCarloMethodTabVisible}" />
                                         </row>
+                                        <row>
+                                            <checkbox
+                                                label="${i18n:_('Enable scenarios module')}"
+                                                checked="@{configurationController.scenariosVisible}" />
+                                        </row>
                                     </rows>
                                 </grid>
                             </row>