diff --git a/src/lib/dhcp/pkt4.cc b/src/lib/dhcp/pkt4.cc
index 7803101245..83bf70d555 100644
--- a/src/lib/dhcp/pkt4.cc
+++ b/src/lib/dhcp/pkt4.cc
@@ -481,13 +481,7 @@ void
 Pkt4::setHWAddrMember(const uint8_t htype, const uint8_t hlen,
                       const std::vector<uint8_t>& mac_addr,
                       HWAddrPtr& hw_addr) {
-    /// @todo Rewrite this once support for client-identifier option
-    /// is implemented (ticket 1228?)
-    if (hlen > MAX_CHADDR_LEN) {
-        isc_throw(OutOfRange, "Hardware address (len=" << static_cast<uint32_t>(hlen)
-                  << ") too long. Max " << MAX_CHADDR_LEN << " supported.");
-
-    } else if (mac_addr.empty() && (hlen > 0) ) {
+    if (mac_addr.empty() && (hlen > 0) ) {
         isc_throw(OutOfRange, "Invalid HW Address specified");
     }