diff --git a/compiler/semfold.nim b/compiler/semfold.nim
index 51ce3e0c84..3425aaaf6a 100644
--- a/compiler/semfold.nim
+++ b/compiler/semfold.nim
@@ -410,8 +410,9 @@ proc foldConv(n, a: PNode; idgen: IdGenerator; g: ModuleGraph; check = false): P
     of tyChar, tyUInt..tyUInt64, tyInt..tyInt64:
       var val = a.getOrdValue
       if dstTyp.kind in {tyUInt..tyUInt64}:
-        result = newIntNodeT(val, n, idgen, g)
+        result = newIntNodeT(maskBytes(val, getSize(g.config, dstTyp)), n, idgen, g)
         result.transitionIntKind(nkUIntLit)
+        result.typ = dstTyp
       else:
         if check: rangeCheck(n, val, g)
         result = newIntNodeT(val, n, idgen, g)
diff --git a/tests/int/t1.nim b/tests/int/t1.nim
index d08f5f29bf..a88a3f34ca 100644
--- a/tests/int/t1.nim
+++ b/tests/int/t1.nim
@@ -37,3 +37,8 @@ block:
   # bug #14522
   doAssert 0xFF000000_00000000.uint64 == 18374686479671623680'u64
 
+block: # bug #23954
+  let testRT_u8 : uint8 = 0x107.uint8
+  doAssert testRT_u8 == 7
+  const testCT_u8 : uint8 = 0x107.uint8
+  doAssert testCT_u8 == 7