diff --git a/Koha/OAI/Server/Identify.pm b/Koha/OAI/Server/Identify.pm
index 7afccef737..a44df73b40 100644
--- a/Koha/OAI/Server/Identify.pm
+++ b/Koha/OAI/Server/Identify.pm
@@ -28,7 +28,10 @@ use base ("HTTP::OAI::Identify");
 sub new {
     my ($class, $repository) = @_;
 
-    my ($baseURL) = $repository->self_url() =~ /(.*)\?.*/;
+    my $baseURL = $repository->self_url();
+    $baseURL = $+{base_url}
+        if $baseURL =~ m/(?<base_url>.*)\?.*/;
+
     my $self = $class->SUPER::new(
         baseURL             => $baseURL,
         repositoryName      => C4::Context->preference("LibraryName"),