diff --git a/src/NzbDrone.Core/MetadataSource/TraktProxy.cs b/src/NzbDrone.Core/MetadataSource/TraktProxy.cs
index 2743ab083..664778b63 100644
--- a/src/NzbDrone.Core/MetadataSource/TraktProxy.cs
+++ b/src/NzbDrone.Core/MetadataSource/TraktProxy.cs
@@ -20,7 +20,7 @@ namespace NzbDrone.Core.MetadataSource
     {
         private readonly Logger _logger;
         private static readonly Regex CollapseSpaceRegex = new Regex(@"\s+", RegexOptions.Compiled);
-        private static readonly Regex InvalidSearchCharRegex = new Regex(@"(?:\*|\(|\)|'|!)", RegexOptions.Compiled);
+        private static readonly Regex InvalidSearchCharRegex = new Regex(@"(?:\*|\(|\)|'|!|@)", RegexOptions.Compiled);
 
         public TraktProxy(Logger logger)
         {
@@ -168,7 +168,9 @@ namespace NzbDrone.Core.MetadataSource
             phrase = phrase.RemoveAccent().ToLower();
             phrase = InvalidSearchCharRegex.Replace(phrase, "");
             phrase = CollapseSpaceRegex.Replace(phrase, " ").Trim().ToLower();
+            phrase = phrase.Trim('-');
             phrase = HttpUtility.UrlEncode(phrase);
+            
 
             return phrase;
         }