diff --git a/lib/os/class.ISPConfigDebianOS.inc.php b/lib/os/class.ISPConfigDebianOS.inc.php
index 309971d27cbb89ca0ccfaa9955f4b7a500590496..9a8e1066e0855fac9593edfbf415209e23864304 100644
--- a/lib/os/class.ISPConfigDebianOS.inc.php
+++ b/lib/os/class.ISPConfigDebianOS.inc.php
@@ -1758,8 +1758,6 @@ mailman-unsubscribe:  "|/var/lib/mailman/mail/mailman unsubscribe mailman"';
 		}
 
 		$packages = array(
-			'quota',
-			'quotatool',
 			'haveged',
 			'geoip-database',
 			'libclass-dbi-mysql-perl',
@@ -1776,6 +1774,12 @@ mailman-unsubscribe:  "|/var/lib/mailman/mail/mailman unsubscribe mailman"';
 		$this->installPackages($packages);
 
 		if(ISPConfig::shallInstall('quota')) {
+			$packages = array(
+				'quota',
+				'quotatool'
+			);
+			$this->installPackages($packages);
+
 			// check kernel if it is virtual
 			$check = $this->getPackageVersion('linux-image-virtual');
 			if($check) {