diff --git a/source/Core/Models/Token.cs b/source/Core/Models/Token.cs
index ca6178780..acdcd9237 100644
--- a/source/Core/Models/Token.cs
+++ b/source/Core/Models/Token.cs
@@ -62,7 +62,7 @@ public string SubjectId
         {
             get
             {
-                return Claims.Single(x => x.Type == Constants.ClaimTypes.Subject).Value;
+                return Claims.Where(x => x.Type == Constants.ClaimTypes.Subject).Select(x => x.Value).SingleOrDefault();
             }
         }