diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 7985f45c9..e908f5bda 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -4702,7 +4702,7 @@ void Tokenizer::createLinks2()
             } else {
                 type.pop();
                 if (Token::Match(token, "> %name%") && !token->next()->isKeyword() &&
-                    Token::Match(top1->tokAt(-2), "%op% %name% <") &&
+                    Token::Match(top1->tokAt(-2), "%op% %name% <") && top1->strAt(-2) != "<" &&
                     (templateTokens.empty() || top1 != templateTokens.top()))
                     continue;
                 Token::createMutualLinks(top1, token);
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index 905743686..035e413c7 100644
--- a/test/testtokenize.cpp
+++ b/test/testtokenize.cpp
@@ -3250,6 +3250,20 @@ private:
             ASSERT(nullptr == Token::findsimplematch(tokenizer.tokens(), "<")->link());
         }
 
+        {
+            // #11319
+            const char code[] = "using std::same_as;\n"
+                                "template<same_as<int> T>\n"
+                                "void f();";
+            Tokenizer tokenizer(&settings0, this);
+            std::istringstream istr(code);
+            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            const Token *tok1 = Token::findsimplematch(tokenizer.tokens(), "template <");
+            const Token *tok2 = Token ::findsimplematch(tokenizer.tokens(), "same_as <");
+            ASSERT(tok1->next()->link() == tok1->tokAt(7));
+            ASSERT(tok2->next()->link() == tok2->tokAt(3));
+        }
+
         {
             // #9131 - template usage or comparison?
             const char code[] = "using std::list; list<t *> l;";