diff --git a/install/autoupdate.php b/install/autoupdate.php
index c716d1a76b4af2c5a5ae2b6712ec2696f251ab99..5913974ab76e3bddfd45dc781f1930231517b0d1 100644
--- a/install/autoupdate.php
+++ b/install/autoupdate.php
@@ -228,8 +228,10 @@ if($conf['services']['mail'] == true) {
 	$inst->configure_spamassassin();
 
 	//** Configure Amavis
-	swriteln('Configuring Amavisd');
-	$inst->configure_amavis();
+	if($conf['amavis']['installed'] == true) {
+		swriteln('Configuring Amavisd');
+		$inst->configure_amavis();
+	}
 
 	//** Configure Getmail
 	swriteln('Configuring Getmail');
diff --git a/install/install.php b/install/install.php
index 9add1b3c60ed75f1cc2ca339213dd55cdd0ab1bd..75a8b70dda83b7beb422a50b2d317e45e5569a69 100644
--- a/install/install.php
+++ b/install/install.php
@@ -216,8 +216,10 @@ if($install_mode == 'standard') {
 	$inst->configure_spamassassin();
 
 	//* Configure Amavis
-	swriteln('Configuring Amavisd');
-	$inst->configure_amavis();
+	if($conf['amavis']['installed'] == true) {
+		swriteln('Configuring Amavisd');
+		$inst->configure_amavis();
+	}
 
 	//* Configure Getmail
 	swriteln('Configuring Getmail');
diff --git a/install/update.php b/install/update.php
index 2788998dc578dbe365ef6c7729622b056223fa4c..249c67f820cceab9a462104021159a677595398a 100644
--- a/install/update.php
+++ b/install/update.php
@@ -289,8 +289,10 @@ if($reconfigure_services_answer == 'yes') {
 		$inst->configure_spamassassin();
 
 		//** Configure Amavis
-		swriteln('Configuring Amavisd');
-		$inst->configure_amavis();
+		if($conf['amavis']['installed'] == true) {
+			swriteln('Configuring Amavisd');
+			$inst->configure_amavis();
+		}
 
 		//** Configure Getmail
 		swriteln('Configuring Getmail');