diff --git a/clang/lib/AST/StmtPrinter.cpp b/clang/lib/AST/StmtPrinter.cpp
index 2d1845e41c9de..a28b2ac7e6162 100644
--- a/clang/lib/AST/StmtPrinter.cpp
+++ b/clang/lib/AST/StmtPrinter.cpp
@@ -1316,8 +1316,9 @@ void StmtPrinter::VisitDeclRefExpr(DeclRefExpr *Node) {
   if (Node->hasTemplateKeyword())
     OS << "template ";
 
-  bool ForceAnonymous =
-      Policy.PrintAsCanonical && VD->getKind() == Decl::NonTypeTemplateParm;
+  bool ForceAnonymous = Policy.PrintAsCanonical &&
+                        !Policy.SkipCanonicalizationOfTemplateTypeParms &&
+                        VD->getKind() == Decl::NonTypeTemplateParm;
   DeclarationNameInfo NameInfo = Node->getNameInfo();
   if (IdentifierInfo *ID = NameInfo.getName().getAsIdentifierInfo();
       !ForceAnonymous &&
diff --git a/clang/test/CodeGenSYCL/int_header_nttp.cpp b/clang/test/CodeGenSYCL/int_header_nttp.cpp
index 507e6b207246b..fe0ee3213f98f 100644
--- a/clang/test/CodeGenSYCL/int_header_nttp.cpp
+++ b/clang/test/CodeGenSYCL/int_header_nttp.cpp
@@ -8,6 +8,7 @@
 // CHECK: Forward declarations of templated kernel function types:
 // CHECK-NEXT: template <typename T, T nttp> struct SelfReferentialNTTP;
 // CHECK-NEXT: template <typename U, int nttp> struct NonSelfRef;
+// CHECK-NEXT: template <int N> struct alignas(N)  OpaqueType;
 
 template<typename T, T nttp>
 struct SelfReferentialNTTP {};
@@ -17,7 +18,15 @@ using Foo = int;
 template<typename U, Foo nttp>
 struct NonSelfRef {};
 
+template <int N> struct alignas(N) OpaqueType {
+  char data[N];
+};
+template <typename T> class Kernel;
+
 void foo() {
-  sycl::kernel_single_task<SelfReferentialNTTP<int, 1>>([](){});
-  sycl::kernel_single_task<NonSelfRef<int, 1>>([](){});
+  auto Lambda = [](){};
+  sycl::kernel_single_task<SelfReferentialNTTP<int, 1>>(Lambda);
+  sycl::kernel_single_task<NonSelfRef<int, 1>>(Lambda);
+  using scalar_t = OpaqueType<sizeof(int)>;
+  sycl::kernel_single_task<class Kernel<scalar_t>>(Lambda);
 }