diff --git a/mw/i2c_service/controller/ads7828/controller.cpp b/mw/i2c_service/controller/ads7828/controller.cpp
index c28d55e5..8e58af65 100644
--- a/mw/i2c_service/controller/ads7828/controller.cpp
+++ b/mw/i2c_service/controller/ads7828/controller.cpp
@@ -59,6 +59,9 @@ std::optional<uint16_t> ADS7828::GetAdcRawRead(const uint8_t& channel) const {
     if (!res.has_value()) {
         return std::nullopt;
     }
+    if (res.value().size() != 2) {
+        return std::nullopt;
+    }
     uint16_t data = ((res.value()[0]) << 8);
     data |= res.value()[1];
     return data;
diff --git a/mw/i2c_service/tests/test_ads7828.cc b/mw/i2c_service/tests/test_ads7828.cc
index 07ce56e5..bbf68533 100644
--- a/mw/i2c_service/tests/test_ads7828.cc
+++ b/mw/i2c_service/tests/test_ads7828.cc
@@ -74,6 +74,9 @@ std::tuple<uint8_t, std::optional<std::vector<uint8_t>>, std::optional<uint16_t>
 // tuple<channel, i2cWriteReadMockRes, expectedRawRead, expectedVoltage>
 INSTANTIATE_TEST_SUITE_P(GetAdcRawReadandVoltageTestParams, GetAdcRawReadandVoltageTest, ::testing::Values(
     std::make_tuple(0, std::optional<std::vector<uint8_t>>{}, std::optional<uint16_t>{}, std::optional<float>{}),
+    // EOF from i2c_service (empty vector): must not crash
+    std::make_tuple(0, std::optional<std::vector<uint8_t>>{std::vector<uint8_t>{}},
+      std::optional<uint16_t>{}, std::optional<float>{}),
     std::make_tuple(1, std::optional<std::vector<uint8_t>>{{0, 1}}, std::optional<uint16_t>{1},
       std::optional<float>{0.000805664051}),
     std::make_tuple(2, std::optional<std::vector<uint8_t>>{{1, 1}}, std::optional<uint16_t>{257},