diff --git a/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DhcpManager.java b/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DhcpManager.java
index a1707e0..572fb15 100644
--- a/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DhcpManager.java
+++ b/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DhcpManager.java
@@ -354,7 +354,8 @@
                 option = new DHCPOption();
                 option.setCode(DHCP.DHCPOptionCode.OptionCode_LeaseTime.getValue());
                 option.setLength((byte) 4);
-                option.setData(ByteBuffer.allocate(4).putInt(leaseTime).array());
+                option.setData(ByteBuffer.allocate(4)
+                        .putInt(ipAssignment == null ? leaseTime : ipAssignment.leasePeriod()).array());
                 optionList.add(option);
 
                 // IP Address Renewal Time.