diff --git a/backend/services.plr-intake.tests/.vscode/settings.json b/backend/services.plr-intake.tests/.vscode/settings.json
index 9954897ca..f7c3f245a 100644
--- a/backend/services.plr-intake.tests/.vscode/settings.json
+++ b/backend/services.plr-intake.tests/.vscode/settings.json
@@ -10,7 +10,6 @@
   "files.trimTrailingWhitespace": true,
   "git.ignoreLimitWarning": true,
   "omnisharp.enableEditorConfigSupport": true,
-  "omnisharp.enableRoslynAnalyzers": true,
   "search.exclude": {
     "**/bin": true,
     "**/logs": true,
diff --git a/backend/services.plr-intake.tests/Features/Records/Search.cs b/backend/services.plr-intake.tests/Features/Records/Search.cs
index fc280abbc..c92e8d982 100644
--- a/backend/services.plr-intake.tests/Features/Records/Search.cs
+++ b/backend/services.plr-intake.tests/Features/Records/Search.cs
@@ -56,7 +56,7 @@ public async void SearchRecords_SingleRecord_SingleCpn()
 
     [Theory]
     [MemberData(nameof(IdMatchTestData))]
-    public async void SearchRecords_TrimsTo5DigitsAndLeadingZeros_Match(string dbId, string searchId)
+    public async void SearchRecords_TrimsSpacesTrimsTo5DigitsAndLeadingZeros_Match(string dbId, string searchId)
     {
         var record = this.TestDb.Has(new PlrRecord
         {
@@ -98,6 +98,10 @@ public static IEnumerable<object[]> IdMatchTestData()
         yield return new[] { "00005", "9900005" };
         yield return new[] { "5", "9900005" };
         yield return new[] { "1234", "9901234" };
+
+        // Should trim leading and trailing spaces.
+        yield return new[] { "00012", "          12     " };
+        yield return new[] { "12345", "  99912345  " };
     }
 
     [Theory]
diff --git a/backend/services.plr-intake/Features/Records/Search.cs b/backend/services.plr-intake/Features/Records/Search.cs
index e744f09bf..185dbb5bf 100644
--- a/backend/services.plr-intake/Features/Records/Search.cs
+++ b/backend/services.plr-intake/Features/Records/Search.cs
@@ -35,6 +35,7 @@ public class QueryHandler : IQueryHandler<Query, List<string>>
         public async Task<List<string>> HandleAsync(Query query)
         {
             var paddedId = query.CollegeId
+                .Trim()
                 .PadLeft(5, '0')
                 [^5..];