diff --git a/classes/utils/Config.class.php b/classes/utils/Config.class.php
index 0e8d46c35..163d1c821 100644
--- a/classes/utils/Config.class.php
+++ b/classes/utils/Config.class.php
@@ -380,6 +380,10 @@ private static function load($virtualhost = null)
         $k = 'storage_filesystem_per_day_min_days_to_clean_empty_directories';
         if( -1 == self::$parameters[$k] ) {
             self::$parameters[$k] = self::$parameters['max_transfer_days_valid'];
+            $kmax = 'storage_filesystem_per_day_max_days_to_clean_empty_directories';
+            if( self::$parameters[$kmax] < self::$parameters[$k] ) {
+                self::$parameters[$kmax] = self::$parameters[$k] + 30;
+            }
         }
 
         if( Config::get("storage_filesystem_per_day_max_days_to_clean_empty_directories") < Config::get("storage_filesystem_per_day_min_days_to_clean_empty_directories")) {