diff --git a/compiler/vmgen.nim b/compiler/vmgen.nim
index ad009298ca..898b5b5def 100644
--- a/compiler/vmgen.nim
+++ b/compiler/vmgen.nim
@@ -1726,6 +1726,9 @@ proc genAsgn(c: PCtx; le, ri: PNode; requiresCopy: bool) =
   of nkHiddenStdConv, nkHiddenSubConv, nkConv:
     if sameBackendType(le.typ, le[1].typ):
       genAsgn(c, le[1], ri, requiresCopy)
+  of nkStmtListExpr:
+    for i in 0..<le.len-1: gen(c, le[i])
+    genAsgn(c, le[^1], ri, requiresCopy)
   else:
     let dest = c.genx(le, {gfNodeAddr})
     genAsgn(c, dest, ri, requiresCopy)
diff --git a/tests/vm/tvmmisc.nim b/tests/vm/tvmmisc.nim
index 35ac6f0ccf..906ced7b83 100644
--- a/tests/vm/tvmmisc.nim
+++ b/tests/vm/tvmmisc.nim
@@ -828,3 +828,30 @@ proc myProc(first: range[0..100]) =
     dec(x)
 
 const r = (myProc(3); 1)
+
+block: # bug #25682
+  type Obj = object
+    x: int
+
+  template value(self: Obj): int =
+    let m = 1223
+    discard m
+    self.x
+
+  static:
+    var r = Obj(x: 10)
+    r.value = 42
+    doAssert r.x == 42
+
+block:
+  type Obj = object
+    x: int
+
+  template value(self: Obj): int =
+    ## doc comment
+    self.x
+
+  static:
+    var r = Obj(x: 10)
+    r.value = 42
+    doAssert r.x == 42