diff --git a/lib/zclient.c b/lib/zclient.c
index 5cd11fb347..c971bff6e2 100644
--- a/lib/zclient.c
+++ b/lib/zclient.c
@@ -1048,7 +1048,7 @@ zebra_interface_if_set_value (struct stream *s, struct interface *ifp)
 #else
   ifp->hw_addr_len = stream_getl (s);
   if (ifp->hw_addr_len)
-    stream_get (ifp->hw_addr, s, ifp->hw_addr_len);
+    stream_get (ifp->hw_addr, s, MIN(ifp->hw_addr_len, INTERFACE_HWADDR_MAX));
 #endif /* HAVE_STRUCT_SOCKADDR_DL */
 }