diff --git a/config/production.env b/config/production.env
index 24435f7c..602e2113 100644
--- a/config/production.env
+++ b/config/production.env
@@ -10,7 +10,7 @@ NYPL_OAUTH_URL=https://isso.nypl.org/
 ENCRYPTED_NYPL_OAUTH_ID=AQECAHh7ea2tyZ6phZgT4B9BDKwguhlFtRC6hgt+7HbmeFsrsgAAAGswaQYJKoZIhvcNAQcGoFwwWgIBADBVBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDMLKVUQA58B6vprNcAIBEIAoaz0lI9EL2M9NyTuEwT8JDmPBt6aXfMiFs027DEuwsCN0wS0qWeFL1g==
 ENCRYPTED_NYPL_OAUTH_SECRET=AQECAHh7ea2tyZ6phZgT4B9BDKwguhlFtRC6hgt+7HbmeFsrsgAAAIcwgYQGCSqGSIb3DQEHBqB3MHUCAQAwcAYJKoZIhvcNAQcBMB4GCWCGSAFlAwQBLjARBAyWz91LOP2YP5fg0q0CARCAQ9inO9SV1M8R0Pkkx84r7UdwlU1FxfXvIjk/z6Qs81KBAVELhby2iD5LawQyDrR9tjhuMbotS6QnydwwMR/p8+qJXHI=
 
-NYPL_CORE_VERSION=v2.24
+NYPL_CORE_VERSION=v2.25
 
 LOG_LEVEL=info
 FEATURES=on-site-edd
diff --git a/config/qa.env b/config/qa.env
index f27a0361..5ffd716d 100644
--- a/config/qa.env
+++ b/config/qa.env
@@ -10,7 +10,7 @@ NYPL_OAUTH_URL=https://isso.nypl.org/
 ENCRYPTED_NYPL_OAUTH_ID=AQECAHh7ea2tyZ6phZgT4B9BDKwguhlFtRC6hgt+7HbmeFsrsgAAAGswaQYJKoZIhvcNAQcGoFwwWgIBADBVBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDMLKVUQA58B6vprNcAIBEIAoaz0lI9EL2M9NyTuEwT8JDmPBt6aXfMiFs027DEuwsCN0wS0qWeFL1g==
 ENCRYPTED_NYPL_OAUTH_SECRET=AQECAHh7ea2tyZ6phZgT4B9BDKwguhlFtRC6hgt+7HbmeFsrsgAAAIcwgYQGCSqGSIb3DQEHBqB3MHUCAQAwcAYJKoZIhvcNAQcBMB4GCWCGSAFlAwQBLjARBAyWz91LOP2YP5fg0q0CARCAQ9inO9SV1M8R0Pkkx84r7UdwlU1FxfXvIjk/z6Qs81KBAVELhby2iD5LawQyDrR9tjhuMbotS6QnydwwMR/p8+qJXHI=
 
-NYPL_CORE_VERSION=v2.24
+NYPL_CORE_VERSION=v2.25
 
 LOG_LEVEL=info
 FEATURES=on-site-edd
diff --git a/lib/elasticsearch/elastic-query-builder.js b/lib/elasticsearch/elastic-query-builder.js
index 84615112..b0765577 100644
--- a/lib/elasticsearch/elastic-query-builder.js
+++ b/lib/elasticsearch/elastic-query-builder.js
@@ -255,7 +255,7 @@ class ElasticQueryBuilder {
   * Require strong match on queried callnumber
   **/
   requireCallnumberMatch () {
-    const q = this.request.querySansQuotes()
+    const q = this.request.querySansQuotes().trim()
 
     this.query.addMust({
       bool: {
diff --git a/test/elastic-query-builder.test.js b/test/elastic-query-builder.test.js
index 7c94654a..1f19cd50 100644
--- a/test/elastic-query-builder.test.js
+++ b/test/elastic-query-builder.test.js
@@ -218,7 +218,8 @@ describe('ElasticQueryBuilder', () => {
 
   describe('search_scope callnumber', () => {
     it('generates a "callnumber" query', () => {
-      const request = new ApiRequest({ q: 'toast', search_scope: 'callnumber' })
+      // including leading and trailing whitespace to validate that query is trimmed
+      const request = new ApiRequest({ q: ' toast   ', search_scope: 'callnumber' })
       const inst = ElasticQueryBuilder.forApiRequest(request)
 
       // Expect multiple term/prefix matches on identifier fields: