diff --git a/plugins/acl/config.inc.php.dist b/plugins/acl/config.inc.php.dist
index 206bfb25666..7041c16893f 100644
--- a/plugins/acl/config.inc.php.dist
+++ b/plugins/acl/config.inc.php.dist
@@ -1,5 +1,7 @@
 <?php
 
+$config = [];
+
 // Default look of access rights table
 // In advanced mode all access rights are displayed separately
 // In simple mode access rights are grouped into four groups: read, write, delete, full
diff --git a/plugins/additional_message_headers/config.inc.php.dist b/plugins/additional_message_headers/config.inc.php.dist
index b00ff29ddb2..141ad0c9215 100644
--- a/plugins/additional_message_headers/config.inc.php.dist
+++ b/plugins/additional_message_headers/config.inc.php.dist
@@ -1,5 +1,7 @@
 <?php
 
+$config = [];
+
 // Header name to header value definitions.
 // Values can use variables: %u - username, %l - local part of username, %d - domain part of username
 $config['additional_message_headers'] = [];
diff --git a/plugins/database_attachments/config.inc.php.dist b/plugins/database_attachments/config.inc.php.dist
index dd3ad7d6399..29f6e78a03d 100644
--- a/plugins/database_attachments/config.inc.php.dist
+++ b/plugins/database_attachments/config.inc.php.dist
@@ -1,5 +1,7 @@
 <?php
 
+$config = [];
+
 // By default this plugin stores attachments in filesystem
 // and copies them into sql database.
 // You can change it to use 'memcache', 'memcached', 'redis' or 'apc'.
diff --git a/plugins/emoticons/config.inc.php.dist b/plugins/emoticons/config.inc.php.dist
index 1af6f6763c3..03cf031fece 100644
--- a/plugins/emoticons/config.inc.php.dist
+++ b/plugins/emoticons/config.inc.php.dist
@@ -1,5 +1,7 @@
 <?php
 
+$config = [];
+
 // Enable emoticons in plain text messages preview
 $config['emoticons_display'] = false;
 
diff --git a/plugins/enigma/config.inc.php.dist b/plugins/enigma/config.inc.php.dist
index d654c764d31..61c68baabd7 100644
--- a/plugins/enigma/config.inc.php.dist
+++ b/plugins/enigma/config.inc.php.dist
@@ -1,5 +1,7 @@
 <?php
 
+$config = [];
+
 // Enigma Plugin options
 // --------------------
 
diff --git a/plugins/help/config.inc.php.dist b/plugins/help/config.inc.php.dist
index fbb3e20105d..788a9514326 100644
--- a/plugins/help/config.inc.php.dist
+++ b/plugins/help/config.inc.php.dist
@@ -1,5 +1,7 @@
 <?php
 
+$config = [];
+
 // Help content iframe source
 // %l will be replaced by the language code resolved using the 'help_language_map' option
 // If you are serving roundcube via https, then change this URL to https also.
diff --git a/plugins/http_authentication/config.inc.php.dist b/plugins/http_authentication/config.inc.php.dist
index 3aa38027067..9d4d44ca149 100644
--- a/plugins/http_authentication/config.inc.php.dist
+++ b/plugins/http_authentication/config.inc.php.dist
@@ -1,5 +1,7 @@
 <?php
 
+$config = [];
+
 // HTTP Basic Authentication Plugin options
 // ----------------------------------------
 // Default mail host to log-in using user/password from HTTP Authentication.
diff --git a/plugins/jqueryui/config.inc.php.dist b/plugins/jqueryui/config.inc.php.dist
index fc689916e9d..d2e7db4a406 100644
--- a/plugins/jqueryui/config.inc.php.dist
+++ b/plugins/jqueryui/config.inc.php.dist
@@ -1,5 +1,7 @@
 <?php
 
+$config = [];
+
 // if you want to load localization strings for specific sub-libraries of jquery-ui, configure them here
 $config['jquery_ui_i18n'] = ['datepicker'];
 
diff --git a/plugins/krb_authentication/config.inc.php.dist b/plugins/krb_authentication/config.inc.php.dist
index 18370015a93..d7aa5bd9d26 100644
--- a/plugins/krb_authentication/config.inc.php.dist
+++ b/plugins/krb_authentication/config.inc.php.dist
@@ -1,5 +1,7 @@
 <?php
 
+$config = [];
+
 // Kerberos/GSSAPI Authentication Plugin options
 // ---------------------------------------------
 
diff --git a/plugins/managesieve/config.inc.php.dist b/plugins/managesieve/config.inc.php.dist
index c28daa90093..6f1d9040ed5 100644
--- a/plugins/managesieve/config.inc.php.dist
+++ b/plugins/managesieve/config.inc.php.dist
@@ -1,5 +1,7 @@
 <?php
 
+$config = [];
+
 // Managesieve server host (and optional port). Default: localhost.
 // Replacement variables supported in host name:
 // %h - user's IMAP hostname
diff --git a/plugins/markasjunk/config.inc.php.dist b/plugins/markasjunk/config.inc.php.dist
index 2ecbb8dcae2..e476802f1c1 100644
--- a/plugins/markasjunk/config.inc.php.dist
+++ b/plugins/markasjunk/config.inc.php.dist
@@ -1,5 +1,7 @@
 <?php
 
+$config = [];
+
 // Learning driver
 // Use an external process such as sa-learn to learn from spam/ham messages. Default: null.
 // Please see the README for more information
diff --git a/plugins/new_user_identity/config.inc.php.dist b/plugins/new_user_identity/config.inc.php.dist
index 87f28166b5a..ddea375d4c9 100644
--- a/plugins/new_user_identity/config.inc.php.dist
+++ b/plugins/new_user_identity/config.inc.php.dist
@@ -1,5 +1,7 @@
 <?php
 
+$config = [];
+
 // The id of the address book to use to automatically set a
 // user's full name in their new identity. (This should be an
 // string, which refers to the $config['ldap_public'] array.)
diff --git a/plugins/newmail_notifier/config.inc.php.dist b/plugins/newmail_notifier/config.inc.php.dist
index 26e8a46bedc..001ebe54bf0 100644
--- a/plugins/newmail_notifier/config.inc.php.dist
+++ b/plugins/newmail_notifier/config.inc.php.dist
@@ -1,5 +1,7 @@
 <?php
 
+$config = [];
+
 // Enables basic notification
 $config['newmail_notifier_basic'] = false;
 
diff --git a/plugins/password/config.inc.php.dist b/plugins/password/config.inc.php.dist
index b40a1a45cc7..e0ba9fe938a 100644
--- a/plugins/password/config.inc.php.dist
+++ b/plugins/password/config.inc.php.dist
@@ -1,5 +1,7 @@
 <?php
 
+$config = [];
+
 // Password Plugin options
 // -----------------------
 // A driver to use for password change. Default: "sql".
diff --git a/plugins/reconnect/config.inc.php.dist b/plugins/reconnect/config.inc.php.dist
index be5e990f06d..f95a8afc560 100644
--- a/plugins/reconnect/config.inc.php.dist
+++ b/plugins/reconnect/config.inc.php.dist
@@ -1,4 +1,6 @@
 <?php
 
+$config = [];
+
 // Maximum attempts to connect the IMAP server
 $config['reconnect_imap_max_attempts'] = 5;
diff --git a/plugins/redundant_attachments/config.inc.php.dist b/plugins/redundant_attachments/config.inc.php.dist
index a8d0426ee36..560ff351dc2 100644
--- a/plugins/redundant_attachments/config.inc.php.dist
+++ b/plugins/redundant_attachments/config.inc.php.dist
@@ -1,5 +1,7 @@
 <?php
 
+$config = [];
+
 // By default this plugin stores attachments in filesystem and copies them into sql database.
 // In environments with replicated database it is possible to use memcache or redis
 // as a fallback when write-master is unavailable.
diff --git a/plugins/squirrelmail_usercopy/config.inc.php.dist b/plugins/squirrelmail_usercopy/config.inc.php.dist
index 97ac0cd4d38..0c444b28e7a 100644
--- a/plugins/squirrelmail_usercopy/config.inc.php.dist
+++ b/plugins/squirrelmail_usercopy/config.inc.php.dist
@@ -1,5 +1,7 @@
 <?php
 
+$config = [];
+
 // Driver - 'file' or 'sql'
 $config['squirrelmail_driver'] = 'sql';
 
diff --git a/plugins/zipdownload/config.inc.php.dist b/plugins/zipdownload/config.inc.php.dist
index 0c645dcf565..a6911067fc4 100644
--- a/plugins/zipdownload/config.inc.php.dist
+++ b/plugins/zipdownload/config.inc.php.dist
@@ -1,5 +1,7 @@
 <?php
 
+$config = [];
+
 // ZipDownload configuration file
 
 // Zip attachments