diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
index 54462f93c..c0fdcaf9b 100644
--- a/lib/templatesimplifier.cpp
+++ b/lib/templatesimplifier.cpp
@@ -620,7 +620,7 @@ bool TemplateSimplifier::instantiateMatch(const Token *instance, const std::stri
     if (patternAfter) {
         const Token *tok = instance;
         unsigned int indentlevel = 0;
-        for (tok = instance; tok && (tok->str() != ">" || indentlevel > 0); tok = tok->next()) {
+        for (tok = instance; tok && (tok->str() != ">" || indentlevel > 0) && (tok->str() != ">>" || indentlevel > 1); tok = tok->next()) {
             if (Token::Match(tok, "[<,] %var% <") && templateParameters(tok->tokAt(2)) > 0)
                 ++indentlevel;
             if (indentlevel > 0 && tok->str() == ">")
diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
index d076cd44a..ea773fa3f 100644
--- a/test/testsimplifytokens.cpp
+++ b/test/testsimplifytokens.cpp
@@ -135,6 +135,7 @@ private:
         TEST_CASE(template40);  // #5055 - template specialization outside struct
         TEST_CASE(template41);  // #4710 - const in instantiation not handled perfectly
         TEST_CASE(template42);  // #4878 - variadic templates
+        TEST_CASE(template43);  // #5097 - assert due to '>>' not treated as end of template instantiation
         TEST_CASE(template_unhandled);
         TEST_CASE(template_default_parameter);
         TEST_CASE(template_default_type);
@@ -2367,6 +2368,19 @@ private:
         tok(code);
     }
 
+    void template43() { // #5097 - Assert due to '>>' in 'B<A<C>>' not being treated as end of template instantation
+        const char code[] = "template <typename T> struct C { };"
+                            "template <typename T> struct D { static int f() { return C<T>::f(); } };"
+                            "template <typename T> inline int f2() { return D<T>::f(); }"
+                            "template <typename T> int f1(int x, T *) { int id = f2<T>(); return id; }"
+                            "template <> struct C < B < A >> {"
+                            "  static int f() {"
+                            "    return f1 < B < A >> (0, reinterpret_cast< B<A> *>(E<void *>::Int(-1)));"
+                            "  }"
+                            "};";
+        tok(code); // Don't assert
+    }
+
 
     void template_default_parameter() {
         {