diff --git a/app/src/main/java/com/alphawallet/app/ui/widget/adapter/NodeStatusAdapter.java b/app/src/main/java/com/alphawallet/app/ui/widget/adapter/NodeStatusAdapter.java
index 59efcfd160..d02b2f47cc 100644
--- a/app/src/main/java/com/alphawallet/app/ui/widget/adapter/NodeStatusAdapter.java
+++ b/app/src/main/java/com/alphawallet/app/ui/widget/adapter/NodeStatusAdapter.java
@@ -22,6 +22,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.IntStream;
 
 import io.reactivex.Single;
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -117,15 +118,9 @@ private NodeStatus fetchNodeStatus(long chainId)
     private void updateStatus(long chainId, NodeStatus status)
     {
         statusMap.put(chainId, status);
-        int position = 0;
-        for (int i=0; i<networkList.size(); i++)
-        {
-            if (networkList.get(i).chainId == chainId)
-            {
-                position = i;
-                break;
-            }
-        }
+        int position = IntStream.range(0, networkList.size())
+                .filter(i -> networkList.get(i).chainId == chainId)
+                .findFirst().orElse(0);
         notifyItemChanged(position);
         Timber.d("updateStatus: chain: %s-%s: %s", chainId, EthereumNetworkBase.getShortChainName(chainId),status);
     }