diff --git a/vlib/v/checker/checker.v b/vlib/v/checker/checker.v
index 6cadcabd8f..a18225b3e9 100644
--- a/vlib/v/checker/checker.v
+++ b/vlib/v/checker/checker.v
@@ -1487,6 +1487,7 @@ fn (mut c Checker) check_or_last_stmt(mut stmt ast.Stmt, ret_type ast.Type, expr
 					return
 				}
 				last_stmt_typ := c.expr(mut stmt.expr)
+				stmt.typ = last_stmt_typ
 				if last_stmt_typ.has_flag(.option) || last_stmt_typ == ast.none_type {
 					if stmt.expr in [ast.Ident, ast.SelectorExpr, ast.CallExpr, ast.None, ast.CastExpr] {
 						expected_type_name := c.table.type_to_str(ret_type.clear_option_and_result())
diff --git a/vlib/v/tests/match_or_expr_test.v b/vlib/v/tests/match_or_expr_test.v
new file mode 100644
index 0000000000..af90f65499
--- /dev/null
+++ b/vlib/v/tests/match_or_expr_test.v
@@ -0,0 +1,16 @@
+struct Foo {
+	option ?int = none
+}
+
+fn test_main() {
+	test := true
+	foo := Foo{}
+	result := foo.option or {
+		match test {
+			true { 1 }
+			else { 2 }
+		}
+	}
+
+	assert result == 1
+}