diff --git a/install-dev/init.php b/install-dev/init.php
index bc6770892..114603874 100644
--- a/install-dev/init.php
+++ b/install-dev/init.php
@@ -70,7 +70,4 @@ if (!@ini_get('date.timezone'))
 
 // Try to improve memory limit if it's under 32M
 if (Tools::getMemoryLimit() < Tools::getOctets('32M'))
-	ini_set('memory_limit', '32M');
-
-if (Tools::getMemoryLimit() < Tools::getOctets('16M'))
-	die('PrestaShop requires at least 16M of memory to run, please check the memory_limit directive in php.ini or contact your host provider');
+	ini_set('memory_limit', '32M');
\ No newline at end of file
diff --git a/install-dev/theme/views/welcome.phtml b/install-dev/theme/views/welcome.phtml
index 227db1ad9..4e5b06a94 100644
--- a/install-dev/theme/views/welcome.phtml
+++ b/install-dev/theme/views/welcome.phtml
@@ -1,6 +1,6 @@
 <?php $this->displayTemplate('header') ?>
 
-<?php if (true): ?>
+<?php if (Tools::getMemoryLimit() < Tools::getOctets('16M')): ?>
 	<div class="warnBlock"><?php echo $this->l('PrestaShop requires at least 16M of memory to run, please check the memory_limit directive in php.ini or contact your host provider'); ?></div>
 <?php endif; ?>