diff --git a/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java b/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java
index 3055b10..3eab86f 100644
--- a/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java
+++ b/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java
@@ -307,7 +307,7 @@
         NetconfProviderConfig cfg = cfgService.getConfig(appId, NetconfProviderConfig.class);
         if (cfg != null) {
             try {
-                cfg.getDevicesAddresses().stream().forEach(addr -> {
+                cfg.getDevicesAddresses().forEach(addr -> {
                     DeviceId deviceId = getDeviceId(addr.ip().toString(), addr.port());
                     Preconditions.checkNotNull(deviceId, ISNULL);
                     //Netconf configuration object
@@ -375,7 +375,7 @@
         if (cfg != null) {
             log.info("Checking connection to devices in configuration");
             try {
-                cfg.getDevicesAddresses().stream().forEach(addr -> {
+                cfg.getDevicesAddresses().forEach(addr -> {
                     DeviceId deviceId = getDeviceId(addr.ip().toString(), addr.port());
                     Preconditions.checkNotNull(deviceId, ISNULL);
                     //Netconf configuration object
