diff --git a/_include.php b/_include.php
index 9f16ed888..65a689ba4 100644
--- a/_include.php
+++ b/_include.php
@@ -34,3 +34,8 @@
  * Additional configuration file name
  */
 //define('APP_CONFIGURATION_NAME', $_SERVER['HTTP_HOST'].'.ini');
+
+/**
+ * Also update extensions on upgrade
+ */
+//define('SNAPPYMAIL_UPDATE_PLUGINS', 1);
diff --git a/integrations/nextcloud/snappymail/app/include.php b/integrations/nextcloud/snappymail/app/include.php
index aea7ffe6a..1326ed6b7 100644
--- a/integrations/nextcloud/snappymail/app/include.php
+++ b/integrations/nextcloud/snappymail/app/include.php
@@ -42,3 +42,8 @@ if (class_exists('OC')) {
  * Additional configuration file name
  */
 //define('APP_CONFIGURATION_NAME', $_SERVER['HTTP_HOST'].'.ini');
+
+/**
+ * Also update extensions on upgrade
+ */
+define('SNAPPYMAIL_UPDATE_PLUGINS', 1);
diff --git a/snappymail/v/0.0.0/setup.php b/snappymail/v/0.0.0/setup.php
index 577ca8d87..5ef4991be 100644
--- a/snappymail/v/0.0.0/setup.php
+++ b/snappymail/v/0.0.0/setup.php
@@ -167,15 +167,15 @@ if (defined('APP_VERSION'))
 		}
 	}
 
-/*
-	// Update plugins
-	$asApi = !empty($_ENV['SNAPPYMAIL_INCLUDE_AS_API']);
-	$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = true;
-	$aList = \SnappyMail\Repository::getEnabledPackagesNames();
-	foreach ($aList as $sId) {
-		\SnappyMail\Repository::installPackage('plugin', $sId);
+	if (defined('SNAPPYMAIL_UPDATE_PLUGINS')) {
+		// Update plugins
+		$asApi = !empty($_ENV['SNAPPYMAIL_INCLUDE_AS_API']);
+		$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = true;
+		$aList = \SnappyMail\Repository::getEnabledPackagesNames();
+		foreach ($aList as $sId) {
+			\SnappyMail\Repository::installPackage('plugin', $sId);
+		}
+		$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = $asApi;
 	}
-	$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = $asApi;
-*/
 
 }