diff --git a/NetworkManagerConnectivity.cpp b/NetworkManagerConnectivity.cpp
index d33db4d7..b24673de 100644
--- a/NetworkManagerConnectivity.cpp
+++ b/NetworkManagerConnectivity.cpp
@@ -526,20 +526,15 @@ namespace WPEFramework
 
         do
         {
-            if(ginterfaceStatus == false)
+            if(!ginterfaceStatus) // no interface connected
             {
                 NMLOG_DEBUG("no interface connected; no ccm check");
                 gIpv4InternetState = NO_INTERNET;
                 gIpv6InternetState = NO_INTERNET;
                 std::unique_lock<std::mutex> lock(connMutex);
                 cvContinuousMonitor.wait_for(lock, std::chrono::seconds(continuousMonitorTimeout.load()));
-                continue;
-            }
-            else
-            {
-                gIpv4InternetState = UNKNOWN;
-                gIpv6InternetState = UNKNOWN;
                 ipResolveTyp = NSM_IPRESOLVE_WHATEVER;
+                continue;
             }
 
             if(doConnectivityMonitor)
@@ -549,7 +544,7 @@ namespace WPEFramework
                 gIpv6InternetState = UNKNOWN;
                 std::unique_lock<std::mutex> lock(connMutex);
                 cvContinuousMonitor.wait_for(lock, std::chrono::seconds(continuousMonitorTimeout.load()));
-                ipResolveTyp = NSM_IPRESOLVE_WHATEVER; /* some interface change happense*/
+                ipResolveTyp = NSM_IPRESOLVE_WHATEVER; /* some interface change happense */
                 continue;
             }
             else if (ipResolveTyp == NSM_IPRESOLVE_WHATEVER)