diff --git a/change_notes/2024-07-16-fix-fp-606-A2-7-3.md b/change_notes/2024-07-16-fix-fp-606-A2-7-3.md
new file mode 100644
index 0000000000..a4fc343b76
--- /dev/null
+++ b/change_notes/2024-07-16-fix-fp-606-A2-7-3.md
@@ -0,0 +1,2 @@
+- `A2-7-3` - `UndocumentedUserDefinedType.ql`:
+  - Fixes #606. Fix false positive relating to friend functions in template classes.
\ No newline at end of file
diff --git a/cpp/autosar/src/rules/A2-7-3/UndocumentedUserDefinedType.ql b/cpp/autosar/src/rules/A2-7-3/UndocumentedUserDefinedType.ql
index c3295275db..b38cf7d02c 100644
--- a/cpp/autosar/src/rules/A2-7-3/UndocumentedUserDefinedType.ql
+++ b/cpp/autosar/src/rules/A2-7-3/UndocumentedUserDefinedType.ql
@@ -77,7 +77,11 @@ class DocumentableDeclaration extends Declaration {
     // Exclude instantiated template functions, which cannot reasonably be documented.
     not this.(Function).isFromTemplateInstantiation(_) and
     // Exclude anonymous lambda functions.
-    not exists(LambdaExpression lc | lc.getLambdaFunction() = this)
+    not exists(LambdaExpression lc | lc.getLambdaFunction() = this) and
+    //Exclude friend functions (because they have 2 entries in the database), and only one shows documented truly
+    not exists(FriendDecl d |
+      d.getFriend().(Function).getDefinition() = this.getADeclarationEntry()
+    )
     or
     this instanceof MemberVariable and
     declarationType = "member variable" and
diff --git a/cpp/autosar/test/rules/A2-7-3/UndocumentedUserDefinedType.expected b/cpp/autosar/test/rules/A2-7-3/UndocumentedUserDefinedType.expected
index 43a8773361..d14f6e21f7 100644
--- a/cpp/autosar/test/rules/A2-7-3/UndocumentedUserDefinedType.expected
+++ b/cpp/autosar/test/rules/A2-7-3/UndocumentedUserDefinedType.expected
@@ -9,3 +9,4 @@
 | test.cpp:101:6:101:6 | definition of e | Declaration entry for function e is missing documentation. |
 | test.cpp:108:1:108:30 | definition of message_to_string_undocumented | Declaration entry for function message_to_string_undocumented is missing documentation. |
 | test.cpp:180:21:180:24 | definition of kBar | Declaration entry for member variable kBar is missing documentation. |
+| test.cpp:227:14:227:17 | definition of foo3 | Declaration entry for function foo3 is missing documentation. |
diff --git a/cpp/autosar/test/rules/A2-7-3/test.cpp b/cpp/autosar/test/rules/A2-7-3/test.cpp
index 43b75b604a..01f7bad611 100644
--- a/cpp/autosar/test/rules/A2-7-3/test.cpp
+++ b/cpp/autosar/test/rules/A2-7-3/test.cpp
@@ -195,4 +195,34 @@ void testFunctionScope() {
       void fNestedTest(); // COMPLIANT - in function scope
     };
   };
-}
\ No newline at end of file
+}
+
+/// Test documentation
+template <typename T> class ClassG { // COMPLIANT
+private:
+  /// Test documentation
+  int x; // COMPLIANT
+
+public:
+  /// Test documentation
+  friend int foo(ClassG<T> g) { return g.x; } // COMPLIANT
+};
+
+/// Test documentation
+void test() { // COMPLIANT
+  ClassG<int> g;
+  foo(g);
+}
+
+/// Test documentation
+class ClassG2 { // COMPLIANT
+public:
+  /// Test documentation
+  friend int foo2() { return 1; } // COMPLIANT
+};
+
+/// Test documentation
+class ClassG3 { // COMPLIANT
+public:
+  friend int foo3() { return 1; } // NON_COMPLIANT
+};
\ No newline at end of file