diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in
index 8733dc6690..54500cd971 100644
--- a/debian/templates/koha-conf-site.xml.in
+++ b/debian/templates/koha-conf-site.xml.in
@@ -266,6 +266,7 @@ __END_SRU_PUBLICSERVER__
  <authorityservershadow>1</authorityservershadow>
  <pluginsdir>__PLUGINS_DIR__</pluginsdir> <!-- This entry can be repeated to use multiple directories -->
  <enable_plugins>0</enable_plugins>
+ <enable_plugin_browser_upload>0</enable_plugin_browser_upload>
  <upload_path>__UPLOAD_PATH__</upload_path>
  <tmp_path>__TMP_PATH__</tmp_path>
  <intranetdir>/usr/share/koha/intranet/cgi-bin</intranetdir>
diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index 829ffd3e7d..5fa53c1da5 100644
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -79,6 +79,7 @@
  <authorityservershadow>1</authorityservershadow>
  <pluginsdir>__PLUGINS_DIR__</pluginsdir> <!-- This entry can be repeated to use multiple directories -->
  <enable_plugins>0</enable_plugins>
+ <enable_plugin_browser_upload>0</enable_plugin_browser_upload>
  <upload_path></upload_path>
  <tmp_path></tmp_path>
  <intranetdir>__INTRANET_CGI_DIR__</intranetdir>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt
index e23fe82069..f8d7d38b04 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt
@@ -29,9 +29,13 @@
     <div class="container-fluid">
         <div class="row">
             <div class="col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3">
+                [% IF ( browser_upload_enabled.defined ) && ( browser_upload_enabled == 0 ) %]
+                <h1>Plugin browser upload disabled</h1>
+                <p>To enable Koha plugin browser upload, the flag enable_plugin_browser_upload must be set in the Koha configuration file</p>
+                [% ELSE %]
                 <h1>Plugins disabled</h1>
-
                 <p>To enable Koha plugins, the flag enable_plugins must be set in the Koha configuration file</p>
+                [% END %]
             </div>
         </div>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
index 1ee0768912..98f71298a3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
@@ -46,7 +46,9 @@
 
                     [% IF ( CAN_user_plugins_manage ) %]
                         <div class="btn-toolbar" id="toolbar">
+                            [% IF ( enable_browser_upload ) %]
                             <a href="/cgi-bin/koha/plugins/plugins-upload.pl" id="upload_plugin" class="btn btn-default"><i class="fa fa-upload"></i> Upload plugin</a>
+                            [% END %]
 
                             <div class="btn-group">
                                 <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa-solid fa-eye"></i> View plugins by class <span class="caret"></span></button>
diff --git a/plugins/plugins-home.pl b/plugins/plugins-home.pl
index 870fcadfef..4b76299535 100755
--- a/plugins/plugins-home.pl
+++ b/plugins/plugins-home.pl
@@ -59,6 +59,7 @@ if ($plugins_enabled) {
     );
 
     $template->param( plugins => \@plugins, );
+    $template->param( enable_browser_upload => C4::Context->config('enable_plugin_browser_upload') );
 
     $template->param( can_search => C4::Context->config('plugin_repos') ? 1 : 0 );
     my @results;
diff --git a/plugins/plugins-upload.pl b/plugins/plugins-upload.pl
index 3e44f00b7e..1fe6b3b041 100755
--- a/plugins/plugins-upload.pl
+++ b/plugins/plugins-upload.pl
@@ -31,17 +31,22 @@ use Koha::Logger;
 use Koha::Plugins;
 
 my $plugins_enabled = C4::Context->config("enable_plugins");
+my $browser_upload_enabled = C4::Context->config('enable_plugin_browser_upload');
 
 my $input = CGI->new;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {   template_name => ($plugins_enabled) ? "plugins/plugins-upload.tt" : "plugins/plugins-disabled.tt",
+    {   template_name => ($plugins_enabled && $browser_upload_enabled) ? "plugins/plugins-upload.tt" : "plugins/plugins-disabled.tt",
         query         => $input,
         type          => "intranet",
         flagsrequired   => { plugins => 'manage' },
     }
 );
 
+if ($plugins_enabled){
+    $template->param( browser_upload_enabled => $browser_upload_enabled );
+}
+
 my $uploadfilename = $input->param('uploadfile');
 my $uploadfile     = $input->upload('uploadfile');
 my $uploadlocation = $input->param('uploadlocation');
@@ -51,7 +56,7 @@ my ( $tempfile, $tfh );
 
 my %errors;
 
-if ($plugins_enabled) {
+if ($plugins_enabled && $browser_upload_enabled) {
     if ( ( $op eq 'Upload' ) && ( $uploadfile || $uploadlocation ) ) {
         my $plugins_dir = C4::Context->config("pluginsdir");
         $plugins_dir = ref($plugins_dir) eq 'ARRAY' ? $plugins_dir->[0] : $plugins_dir;