diff --git a/src/analyze.cpp b/src/analyze.cpp
index 321915d6ea..222874b875 100644
--- a/src/analyze.cpp
+++ b/src/analyze.cpp
@@ -2445,6 +2445,9 @@ static TypeTableEntry *analyze_array_access_expr(CodeGen *g, ImportTableEntry *i
     if (array_type->id == TypeTableEntryIdInvalid) {
         return_type = g->builtin_types.entry_invalid;
     } else if (array_type->id == TypeTableEntryIdArray) {
+        if (array_type->data.array.len == 0) {
+            add_node_error(g, node, buf_sprintf("out of bounds array access"));
+        }
         return_type = array_type->data.array.child_type;
     } else if (array_type->id == TypeTableEntryIdPointer) {
         return_type = array_type->data.pointer.child_type;
diff --git a/test/run_tests.cpp b/test/run_tests.cpp
index 266720ccbd..3316c792cb 100644
--- a/test/run_tests.cpp
+++ b/test/run_tests.cpp
@@ -1814,6 +1814,13 @@ fn derp(){}
     add_compile_fail_case("assign null to non-nullable pointer", R"SOURCE(
 const a: &u8 = null;
     )SOURCE", 1, ".tmp_source.zig:2:16: error: expected maybe type, got '&u8'");
+
+    add_compile_fail_case("indexing an array of size zero", R"SOURCE(
+const array = []u8{};
+fn foo() {
+    const pointer = &array[0];
+}
+    )SOURCE", 1, ".tmp_source.zig:4:27: error: out of bounds array access");
 }
 
 //////////////////////////////////////////////////////////////////////////////