diff --git a/Koha/Plugins.pm b/Koha/Plugins.pm
index bca7701134..a188d7c815 100644
--- a/Koha/Plugins.pm
+++ b/Koha/Plugins.pm
@@ -27,6 +27,7 @@ use C4::Output;
 
 BEGIN {
     push @INC, C4::Context->config("pluginsdir");
+    pop @INC if $INC[-1] eq '.';
 }
 
 =head1 NAME
diff --git a/Koha/Plugins/Handler.pm b/Koha/Plugins/Handler.pm
index 903b446261..0c0a7b476b 100644
--- a/Koha/Plugins/Handler.pm
+++ b/Koha/Plugins/Handler.pm
@@ -27,6 +27,7 @@ use C4::Context;
 
 BEGIN {
     push @INC, C4::Context->config("pluginsdir");
+     pop @INC if $INC[-1] eq '.' ;
 }
 
 =head1 NAME