diff --git a/src/Core/Services/SearchService.cs b/src/Core/Services/SearchService.cs
index 565379408..0c0bbfe17 100644
--- a/src/Core/Services/SearchService.cs
+++ b/src/Core/Services/SearchService.cs
@@ -77,7 +77,7 @@ namespace Bit.Core.Services
             ct.ThrowIfCancellationRequested();
             var matchedCiphers = new List<CipherView>();
             var lowPriorityMatchedCiphers = new List<CipherView>();
-            query = (query.Trim().ToLower().RemoveDiacritics());
+            query = query.Trim().ToLower().RemoveDiacritics();
 
             foreach (var c in ciphers)
             {
diff --git a/src/Core/Utilities/StringExtensions.cs b/src/Core/Utilities/StringExtensions.cs
index d45530f14..a37dc9f49 100644
--- a/src/Core/Utilities/StringExtensions.cs
+++ b/src/Core/Utilities/StringExtensions.cs
@@ -6,8 +6,13 @@ namespace Bit.Core.Utilities
 {
     public static class StringExtensions
     {
-        public static string RemoveDiacritics(this String text)
+        public static string RemoveDiacritics(this string text)
         {
+            if (string.IsNullOrWhiteSpace(text))
+            {
+                return text;
+            }
+
             var normalizedString = text.Normalize(NormalizationForm.FormD);
             var stringBuilder = new StringBuilder(capacity: normalizedString.Length);
 
@@ -20,14 +25,10 @@ namespace Bit.Core.Utilities
                     stringBuilder.Append(c);
                 }
             }
-            Console.Write(stringBuilder.Length);
-            Console.WriteLine(stringBuilder.ToString().Normalize(NormalizationForm.FormC));
-
 
             return stringBuilder
                 .ToString()
                 .Normalize(NormalizationForm.FormC);
-
         }
     }
 }