diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
index 2d2cea98c4..ac357a283c 100644
--- a/compiler/semexprs.nim
+++ b/compiler/semexprs.nim
@@ -813,7 +813,7 @@ proc semArrayConstr(c: PContext, n: PNode, flags: TExprFlags; expectedType: PTyp
       inc(lastIndex)
     if isGeneric:
       for i in 0..<result.len:
-        if isIntLit(result[i].typ):
+        if result[i].typ != nil and isIntLit(result[i].typ):
           # generic instantiation strips int lit type which makes conversions fail
           result[i].typ() = nil
       result.typ() = nil # current result.typ is invalid, index type is nil
@@ -2799,7 +2799,7 @@ proc semSetConstr(c: PContext, n: PNode, expectedType: PType = nil): PNode =
           expectedElementType = typ
     if isGeneric:
       for i in 0..<n.len:
-        if isIntLit(n[i].typ):
+        if n[i].typ != nil and isIntLit(n[i].typ):
           # generic instantiation strips int lit type which makes conversions fail
           n[i].typ() = nil
         result.add n[i]
@@ -2912,7 +2912,7 @@ proc semTupleFieldsConstr(c: PContext, n: PNode, flags: TExprFlags; expectedType
     result.add n[i]
   if isGeneric:
     for i in 0..<result.len:
-      if isIntLit(result[i][1].typ):
+      if result[i][1].typ != nil and isIntLit(result[i][1].typ):
         # generic instantiation strips int lit type which makes conversions fail
         result[i][1].typ() = nil
     result.typ() = makeTypeFromExpr(c, result.copyTree)
@@ -2953,7 +2953,7 @@ proc semTuplePositionsConstr(c: PContext, n: PNode, flags: TExprFlags; expectedT
     addSonSkipIntLit(typ, n[i].typ.skipTypes({tySink}), c.idgen)
   if isGeneric:
     for i in 0..<result.len:
-      if isIntLit(result[i].typ):
+      if result[i].typ != nil and isIntLit(result[i].typ):
         # generic instantiation strips int lit type which makes conversions fail
         result[i].typ() = nil
     result.typ() = makeTypeFromExpr(c, result.copyTree)
diff --git a/tests/generics/tgenerics_issues.nim b/tests/generics/tgenerics_issues.nim
index 3068a22f25..da202874e1 100644
--- a/tests/generics/tgenerics_issues.nim
+++ b/tests/generics/tgenerics_issues.nim
@@ -892,3 +892,13 @@ block: # https://github.com/nim-lang/Nim/issues/20416
   proc p2[T](sg:Container[T]) = discard
   var v : Container[int]
   p2(v)
+
+block: # issue #25494
+  proc foo[T: enum](s = {T.low..T.high}) =
+    discard
+
+  type
+    MyEnum = enum
+      a, b, c
+
+  foo[MyEnum]()