diff --git a/opac/oai.pl b/opac/oai.pl
index ab56d791d6..573f01a308 100755
--- a/opac/oai.pl
+++ b/opac/oai.pl
@@ -411,6 +411,14 @@ sub new {
         ) );
     }
 
+    # Return error if no results
+    unless ($count) {
+        return HTTP::OAI::Response->new(
+            requestURL => $repository->self_url(),
+            errors     => [ new HTTP::OAI::Error( code => 'noRecordsMatch' ) ],
+        );
+    }
+
     return $self;
 }
 
@@ -586,6 +594,14 @@ sub new {
         }
     }
 
+    # Return error if no results
+    unless ($count) {
+        return HTTP::OAI::Response->new(
+            requestURL => $repository->self_url(),
+            errors     => [ new HTTP::OAI::Error( code => 'noRecordsMatch' ) ],
+        );
+    }
+
     return $self;
 }