diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c32f8d99..99302c997 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -66,6 +66,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 - Fix some cases of 404s from Plex when files were replaced and scanning the library from ETV didn't help
 - Fix more wildcard search phrase queries (when wildcards are used in quotes, like `title:"law & order*"`)
+- Fix non-wildcard simple queries when asterisks are used in quotes, like `title:"m*a*s*h"`
 - Fix bug where channels would unnecessarily wait on each other
   - e.g. in-progress streams would delay responding with a playlist when new streams were starting
 - Update Plex show title in ETV when changed in Plex
diff --git a/ErsatzTV.Infrastructure/Search/CustomMultiFieldQueryParser.cs b/ErsatzTV.Infrastructure/Search/CustomMultiFieldQueryParser.cs
index 67d0c102d..b72360589 100644
--- a/ErsatzTV.Infrastructure/Search/CustomMultiFieldQueryParser.cs
+++ b/ErsatzTV.Infrastructure/Search/CustomMultiFieldQueryParser.cs
@@ -96,7 +96,7 @@ public class CustomMultiFieldQueryParser : MultiFieldQueryParser
         }
 
         // assume asterisk always means wildcard
-        if (queryText.Contains('*'))
+        if (queryText.Contains('*') && queryText.Contains(' '))
         {
             var parser = new ComplexPhraseQueryParser(_matchVersion, LuceneSearchIndex.TitleField, _analyzer)
             {