diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in
index 44f557637d..fe71b9ab48 100644
--- a/debian/templates/koha-conf-site.xml.in
+++ b/debian/templates/koha-conf-site.xml.in
@@ -410,6 +410,7 @@ __END_SRU_PUBLICSERVER__
  <dev_install>0</dev_install>
  <strict_sql_modes>0</strict_sql_modes>
  <plugin_repos>
+    <!--
     <repo>
         <name>ByWater Solutions</name>
         <org_name>bywatersolutions</org_name>
@@ -425,6 +426,7 @@ __END_SRU_PUBLICSERVER__
         <org_name>ptfs-europe</org_name>
         <service>github</service>
     </repo>
+    -->
  </plugin_repos>
 
  <koha_xslt_security>
diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index ead08aab73..9e6cb59047 100644
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -234,6 +234,7 @@ __PAZPAR2_TOGGLE_XML_POST__
  <dev_install>0</dev_install>
  <strict_sql_modes>0</strict_sql_modes>
  <plugin_repos>
+    <!--
     <repo>
         <name>ByWater Solutions</name>
         <org_name>bywatersolutions</org_name>
@@ -249,6 +250,7 @@ __PAZPAR2_TOGGLE_XML_POST__
         <org_name>ptfs-europe</org_name>
         <service>github</service>
     </repo>
+    -->
  </plugin_repos>
 
  <koha_xslt_security>
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 1b24428fde..1dff52810d 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
@@ -41,6 +41,7 @@
                                 </ul>
                             </div>
 
+                            [% IF can_search %]
                             <div class="btn-group">
                                 <form class="form-inline" id="plugin-search-form">
                                     <div class="form-group">
@@ -53,6 +54,7 @@
                                     </div>
                                 </form>
                             </div>
+                            [% END %]
                         </div>
                     [% END %]
                     <h1>Plugins</h1>
diff --git a/plugins/plugins-home.pl b/plugins/plugins-home.pl
index f376e17d08..e3335ab4bd 100755
--- a/plugins/plugins-home.pl
+++ b/plugins/plugins-home.pl
@@ -60,6 +60,7 @@ if ($plugins_enabled) {
 
     $template->param( plugins => \@plugins, );
 
+    $template->param( can_search => C4::Context->config('plugin_repos') ? 1 : 0 );
     my @results;
     if ($plugin_search) {
         my $repos = C4::Context->config('plugin_repos');