diff --git a/impl/src/main/java/org/opencord/olt/impl/fttb/FttbUtils.java b/impl/src/main/java/org/opencord/olt/impl/fttb/FttbUtils.java
index 19d98a5..1ffb732 100644
--- a/impl/src/main/java/org/opencord/olt/impl/fttb/FttbUtils.java
+++ b/impl/src/main/java/org/opencord/olt/impl/fttb/FttbUtils.java
@@ -178,6 +178,10 @@
                         return optHost.get().mac();
                     }
                 }
+            } else if (uniTagInfo.getConfiguredMacAddress() != null &&
+                    !uniTagInfo.getConfiguredMacAddress().isEmpty()) {
+                log.info("Using configured mac address for FTTB {}", uniTagInfo.getConfiguredMacAddress());
+                return MacAddress.valueOf(uniTagInfo.getConfiguredMacAddress());
             }
         }
         return null;