diff --git a/compiler/transf.nim b/compiler/transf.nim
index dd4f3679d8..0d2ee49dc6 100644
--- a/compiler/transf.nim
+++ b/compiler/transf.nim
@@ -107,6 +107,13 @@ proc transformSons(c: PTransf, n: PNode, noConstFold = false): PNode =
   for i in 0..<n.len:
     result[i] = transform(c, n[i], noConstFold)
 
+proc transformSonsAfterType(c: PTransf, n: PNode, noConstFold = false): PNode =
+  result = newTransNode(n)
+  assert n.len != 0
+  result[0] = copyTree(n[0])
+  for i in 1..<n.len:
+    result[i] = transform(c, n[i], noConstFold)
+
 proc newAsgnStmt(c: PTransf, kind: TNodeKind, le: PNode, ri: PNode; isFirstWrite: bool): PNode =
   result = newTransNode(kind, ri.info, 2)
   result[0] = le
@@ -1067,6 +1074,9 @@ proc transform(c: PTransf, n: PNode, noConstFold = false): PNode =
       result = transformAddrDeref(c, n, {nkAddr, nkHiddenAddr})
   of nkHiddenStdConv, nkHiddenSubConv, nkConv:
     result = transformConv(c, n)
+  of nkObjConstr, nkCast:
+    # don't try to transform type node
+    result = transformSonsAfterType(c, n)
   of nkDiscardStmt:
     result = n
     if n[0].kind != nkEmpty:
diff --git a/tests/template/tgenericobjconstr.nim b/tests/template/tgenericobjconstr.nim
new file mode 100644
index 0000000000..753f4756e5
--- /dev/null
+++ b/tests/template/tgenericobjconstr.nim
@@ -0,0 +1,15 @@
+discard """
+  matrix: "--skipParentCfg"
+"""
+
+# issue #24631
+
+type
+  V[d: static bool] = object
+    l: int
+
+template y(): V[false] = V[false](l: 0)
+discard y()
+
+template z(): V[false] = cast[V[false]](V[false](l: 0))
+discard z()