diff --git a/src/Sema.zig b/src/Sema.zig
index 3c999e507e..40f929b778 100644
--- a/src/Sema.zig
+++ b/src/Sema.zig
@@ -27979,6 +27979,8 @@ fn structFieldVal(
             }
 
             const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[field_index]);
+            if (try sema.typeHasOnePossibleValue(field_ty)) |field_val|
+                return Air.internedToRef(field_val.toIntern());
 
             if (try sema.resolveValue(struct_byval)) |struct_val| {
                 if (struct_val.isUndef(mod)) return mod.undefRef(field_ty);
@@ -28620,8 +28622,6 @@ fn elemValArray(
     try sema.validateRuntimeElemAccess(block, elem_index_src, elem_ty, array_ty, array_src);
 
     const runtime_src = if (maybe_undef_array_val != null) elem_index_src else array_src;
-    try sema.requireRuntimeBlock(block, src, runtime_src);
-    try sema.queueFullTypeResolution(array_ty);
     if (oob_safety and block.wantSafety()) {
         // Runtime check is only needed if unable to comptime check
         if (maybe_index_val == null) {
@@ -28630,6 +28630,12 @@ fn elemValArray(
             try sema.panicIndexOutOfBounds(block, src, elem_index, len_inst, cmp_op);
         }
     }
+
+    if (try sema.typeHasOnePossibleValue(elem_ty)) |elem_val|
+        return Air.internedToRef(elem_val.toIntern());
+
+    try sema.requireRuntimeBlock(block, src, runtime_src);
+    try sema.queueFullTypeResolution(array_ty);
     return block.addBinOp(.array_elem_val, array, elem_index);
 }
 
diff --git a/test/behavior/array.zig b/test/behavior/array.zig
index 9761ac5bd7..23ea10557f 100644
--- a/test/behavior/array.zig
+++ b/test/behavior/array.zig
@@ -944,3 +944,14 @@ test "union that needs padding bytes inside an array" {
     const a = as[0].B;
     try std.testing.expect(a.D == 1);
 }
+
+test "runtime index of array of zero-bit values" {
+    var runtime: struct { array: [1]void, index: usize } = undefined;
+    runtime = .{ .array = .{{}}, .index = 0 };
+    const result = struct { index: usize, value: void }{
+        .index = runtime.index,
+        .value = runtime.array[runtime.index],
+    };
+    try std.testing.expect(result.index == 0);
+    try std.testing.expect(result.value == {});
+}