diff --git a/Notesnook.API/Startup.cs b/Notesnook.API/Startup.cs
index baeaf5c..4ad8b4e 100644
--- a/Notesnook.API/Startup.cs
+++ b/Notesnook.API/Startup.cs
@@ -131,13 +131,9 @@ namespace Notesnook.API
                 options.DiscoveryPolicy.RequireHttps = false;
                 options.TokenRetriever = new Func<HttpRequest, string>(req =>
                 {
-                    if (req.Path == "/hubs/sync/v2")
-                    {
-                        var fromQuery = TokenRetrieval.FromQueryString();   //needed for signalr and ws/wss conections to be authed via jwt
-                        return fromQuery(req);
-                    }
                     var fromHeader = TokenRetrieval.FromAuthorizationHeader();
-                    return fromHeader(req);
+                    var fromQuery = TokenRetrieval.FromQueryString();   //needed for signalr and ws/wss conections to be authed via jwt
+                    return fromHeader(req) ?? fromQuery(req);
                 });
 
                 options.Events.OnTokenValidated = (context) =>