diff --git a/compiler/defer.go b/compiler/defer.go
index 522cd812d..f8078f6b5 100644
--- a/compiler/defer.go
+++ b/compiler/defer.go
@@ -32,7 +32,7 @@ func (b *builder) supportsRecover() bool {
 		// proposal of WebAssembly:
 		// https://github.com/WebAssembly/exception-handling
 		return false
-	case "riscv64", "xtensa":
+	case "xtensa":
 		// TODO: add support for these architectures
 		return false
 	default:
@@ -217,12 +217,20 @@ sw $$ra, 4($$5)
 			// So only add them when using hardfloat.
 			constraints += ",~{$f0},~{$f1},~{$f2},~{$f3},~{$f4},~{$f5},~{$f6},~{$f7},~{$f8},~{$f9},~{$f10},~{$f11},~{$f12},~{$f13},~{$f14},~{$f15},~{$f16},~{$f17},~{$f18},~{$f19},~{$f20},~{$f21},~{$f22},~{$f23},~{$f24},~{$f25},~{$f26},~{$f27},~{$f28},~{$f29},~{$f30},~{$f31}"
 		}
-	case "riscv32":
-		asmString = `
+	case "riscv32", "riscv64":
+		if b.archFamily() == "riscv32" {
+			asmString = `
 la a2, 1f
 sw a2, 4(a1)
 li a0, 0
 1:`
+		} else {
+			asmString = `
+la a2, 1f
+sd a2, 8(a1)
+li a0, 0
+1:`
+		}
 		constraints = "={a0},{a1},~{a1},~{a2},~{a3},~{a4},~{a5},~{a6},~{a7},~{s0},~{s1},~{s2},~{s3},~{s4},~{s5},~{s6},~{s7},~{s8},~{s9},~{s10},~{s11},~{t0},~{t1},~{t2},~{t3},~{t4},~{t5},~{t6},~{ra},~{f0},~{f1},~{f2},~{f3},~{f4},~{f5},~{f6},~{f7},~{f8},~{f9},~{f10},~{f11},~{f12},~{f13},~{f14},~{f15},~{f16},~{f17},~{f18},~{f19},~{f20},~{f21},~{f22},~{f23},~{f24},~{f25},~{f26},~{f27},~{f28},~{f29},~{f30},~{f31},~{memory}"
 	default:
 		// This case should have been handled by b.supportsRecover().
diff --git a/src/runtime/asm_riscv.S b/src/runtime/asm_riscv.S
index 9cf657185..a8f097ac7 100644
--- a/src/runtime/asm_riscv.S
+++ b/src/runtime/asm_riscv.S
@@ -47,8 +47,8 @@ tinygo_scanCurrentStack:
 tinygo_longjmp:
     // Note: the code we jump to assumes a0 is non-zero, which is already the
     // case because that's the defer frame pointer.
-    lw sp, 0(a0)       // jumpSP
-    lw a1, REGSIZE(a0) // jumpPC
+    LREG sp, 0(a0)       // jumpSP
+    LREG a1, REGSIZE(a0) // jumpPC
     jr a1
 
 .section .text.tinygo_checkpointJump