diff --git a/src/inet/InetInterface.cpp b/src/inet/InetInterface.cpp
index 3acaa2492d2b81..5d0eb3aa94243f 100644
--- a/src/inet/InetInterface.cpp
+++ b/src/inet/InetInterface.cpp
@@ -126,24 +126,14 @@ bool InterfaceAddressIterator::Next()
     if (mNetifAddrList == nullptr)
     {
         mNetifAddrList = otIp6GetUnicastAddresses(Inet::globalOtInstance);
-
-        if (mNetifAddrList == nullptr)
-        {
-            return false;
-        }
-        mCurAddr = const_cast<otNetifAddress *>(mNetifAddrList);
+        mCurAddr       = mNetifAddrList;
     }
     else if (mCurAddr != nullptr)
     {
         mCurAddr = mCurAddr->mNext;
     }
 
-    if (mCurAddr == nullptr)
-    {
-        return false;
-    }
-
-    return true;
+    return (mCurAddr != nullptr);
 }
 CHIP_ERROR InterfaceAddressIterator::GetAddress(IPAddress & outIPAddress)
 {
diff --git a/src/inet/InetInterface.h b/src/inet/InetInterface.h
index 1663d71f165d9b..d87c1080b89e6c 100644
--- a/src/inet/InetInterface.h
+++ b/src/inet/InetInterface.h
@@ -541,7 +541,7 @@ class DLL_EXPORT InterfaceAddressIterator
 #endif // CHIP_SYSTEM_CONFIG_USE_ZEPHYR_NET_IF
 #if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
     const otNetifAddress * mNetifAddrList;
-    otNetifAddress * mCurAddr;
+    const otNetifAddress * mCurAddr;
 #endif // #if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
 };