diff --git a/modules/ipc/src/main/native/include/wire.h b/modules/ipc/src/main/native/include/wire.h
index 598391ac..ea9ac141 100644
--- a/modules/ipc/src/main/native/include/wire.h
+++ b/modules/ipc/src/main/native/include/wire.h
@@ -896,7 +896,10 @@ class unidirectional_simple_wires {
      *  used by client
      */
     [[nodiscard]] bool is_eor() const {
-        return eor_;
+        if (!eor_) {
+            return false;
+        }
+        return std::all_of(unidirectional_simple_wires_.begin(), unidirectional_simple_wires_.end(), [](const unidirectional_simple_wire& wire) { return !wire.has_record(); });
     }
 
 private: