diff --git a/compiler/sem.nim b/compiler/sem.nim
index 9f116dc31a..5ca7a2871d 100644
--- a/compiler/sem.nim
+++ b/compiler/sem.nim
@@ -459,9 +459,10 @@ proc normalizeTypedescMacroResult(c: PContext, n: PNode): PNode =
   if result.kind == nkStmtList:
     result.transitionSonsKind(nkStmtListType)
 
+  const maxTypedescMacroNormalizationPasses = 32
   # Resolve surviving compile-time branches so later passes don't walk
   # unevaluated type AST for a typedesc expression.
-  while true:
+  for _ in 0..<maxTypedescMacroNormalizationPasses:
     if result.kind == nkWhenStmt:
       result = semWhen(c, result, false)
       if result.kind == nkStmtList:
diff --git a/tests/whenstmt/twhen.nim b/tests/whenstmt/twhen.nim
index b155ddcfb3..04e2d8c0c4 100644
--- a/tests/whenstmt/twhen.nim
+++ b/tests/whenstmt/twhen.nim
@@ -45,3 +45,12 @@ elif compiles(nonexistent):
 else:
   output("whenElse")
 
+
+template test(): typedesc =
+  when true:
+    int
+  else:
+    bool
+
+const c = default(test())
+echo c