diff --git a/src/ir.cpp b/src/ir.cpp
index 5b1494553a..42bc8758e2 100644
--- a/src/ir.cpp
+++ b/src/ir.cpp
@@ -17606,12 +17606,15 @@ static IrInstruction *ir_resolve_result(IrAnalyze *ira, IrInstruction *suspend_s
     if (actual_elem_type->id == ZigTypeIdOptional && value_type->id != ZigTypeIdOptional &&
             value_type->id != ZigTypeIdNull)
     {
-        bool has_bits;
-        if ((err = type_has_bits2(ira->codegen, value_type, &has_bits)))
-            return ira->codegen->invalid_instruction;
-        if (has_bits) {
-            result_loc_pass1->written = false;
-            return ir_analyze_unwrap_optional_payload(ira, suspend_source_instr, result_loc, false, true);
+        bool same_comptime_repr = types_have_same_zig_comptime_repr(ira->codegen, actual_elem_type, value_type);
+        if (!same_comptime_repr) {
+            bool has_bits;
+            if ((err = type_has_bits2(ira->codegen, value_type, &has_bits)))
+                return ira->codegen->invalid_instruction;
+            if (has_bits) {
+                result_loc_pass1->written = false;
+                return ir_analyze_unwrap_optional_payload(ira, suspend_source_instr, result_loc, false, true);
+            }
         }
     } else if (actual_elem_type->id == ZigTypeIdErrorUnion && value_type->id != ZigTypeIdErrorUnion) {
         bool has_bits;
diff --git a/test/stage1/behavior.zig b/test/stage1/behavior.zig
index e362a9405e..066551bf1c 100644
--- a/test/stage1/behavior.zig
+++ b/test/stage1/behavior.zig
@@ -82,7 +82,7 @@ comptime {
     _ = @import("behavior/namespace_depends_on_compile_var.zig");
     _ = @import("behavior/new_stack_call.zig");
     _ = @import("behavior/null.zig");
-    //_ = @import("behavior/optional.zig");
+    _ = @import("behavior/optional.zig");
     _ = @import("behavior/pointers.zig");
     _ = @import("behavior/popcount.zig");
     _ = @import("behavior/ptrcast.zig");