diff --git a/gcc/cp/typeck.cc b/gcc/cp/typeck.cc
index 8b60cbbc167077a141729c5992f76849464bd6a2..ff3a49f01b3d4ad5659da4826d9eba874f023ed5 100644
--- a/gcc/cp/typeck.cc
+++ b/gcc/cp/typeck.cc
@@ -11236,9 +11236,6 @@ check_return_expr (tree retval, bool *no_warning)
 			 build_zero_cst (TREE_TYPE (retval)));
     }
 
-  if (processing_template_decl)
-    return saved_retval;
-
   /* A naive attempt to reduce the number of -Wdangling-reference false
      positives: if we know that this function can return a variable with
      static storage duration rather than one of its parameters, suppress
@@ -11250,6 +11247,9 @@ check_return_expr (tree retval, bool *no_warning)
       && TREE_STATIC (bare_retval))
     suppress_warning (current_function_decl, OPT_Wdangling_reference);
 
+  if (processing_template_decl)
+    return saved_retval;
+
   /* Actually copy the value returned into the appropriate location.  */
   if (retval && retval != result)
     {
diff --git a/gcc/testsuite/g++.dg/warn/Wdangling-reference13.C b/gcc/testsuite/g++.dg/warn/Wdangling-reference13.C
new file mode 100644
index 0000000000000000000000000000000000000000..bc09fbae22babe68575f58ba99745f1df5559830
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wdangling-reference13.C
@@ -0,0 +1,23 @@
+// PR c++/109774
+// { dg-do compile }
+// { dg-options "-Wdangling-reference" }
+
+int y;
+
+template<typename T>
+int& get(const char& )
+{
+    return y;
+}
+
+int& get2(const char&)
+{
+    return y;
+}
+
+int stuff(void)
+{
+    const int &h = get<void>(0); // { dg-bogus "dangling reference" }
+    const int &k = get2(0); // { dg-bogus "dangling reference" }
+    return h+k;
+}