diff --git a/pkg/controllers/networkinfo/networkinfo_controller.go b/pkg/controllers/networkinfo/networkinfo_controller.go
index e9848b2d4..9f3804880 100644
--- a/pkg/controllers/networkinfo/networkinfo_controller.go
+++ b/pkg/controllers/networkinfo/networkinfo_controller.go
@@ -93,22 +93,20 @@ func (r *NetworkInfoReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 			log.Error(err, "failed to get the gateway connection status", "req", req.NamespacedName)
 			return common.ResultRequeueAfter10sec, err
 		}
-
 		gatewayConnectionReason := ""
-		if !gatewayConnectionReady {
-			if ncName == commonservice.SystemVPCNetworkConfigurationName {
-				gatewayConnectionReady, gatewayConnectionReason, err = r.Service.ValidateGatewayConnectionStatus(&nc)
-				log.Info("got the gateway connection status", "gatewayConnectionReady", gatewayConnectionReady, "gatewayConnectionReason", gatewayConnectionReason)
-				if err != nil {
-					log.Error(err, "failed to validate the edge and gateway connection", "org", nc.Org, "project", nc.NSXProject)
-					updateFail(r, ctx, obj, &err, r.Client, nil)
-					return common.ResultRequeueAfter10sec, err
-				}
-				setVPCNetworkConfigurationStatusWithGatewayConnection(ctx, r.Client, vpcNetworkConfiguration, gatewayConnectionReady, gatewayConnectionReason)
-			} else {
-				log.Info("skipping reconciling the network info because the system gateway connection is not ready", "NetworkInfo", req.NamespacedName)
-				return common.ResultRequeueAfter60sec, nil
+		if ncName == commonservice.SystemVPCNetworkConfigurationName {
+			gatewayConnectionReady, gatewayConnectionReason, err = r.Service.ValidateGatewayConnectionStatus(&nc)
+			log.Info("got the gateway connection status", "gatewayConnectionReady", gatewayConnectionReady, "gatewayConnectionReason", gatewayConnectionReason)
+			if err != nil {
+				log.Error(err, "failed to validate the edge and gateway connection", "org", nc.Org, "project", nc.NSXProject)
+				updateFail(r, ctx, obj, &err, r.Client, nil)
+				return common.ResultRequeueAfter10sec, err
 			}
+			setVPCNetworkConfigurationStatusWithGatewayConnection(ctx, r.Client, vpcNetworkConfiguration, gatewayConnectionReady, gatewayConnectionReason)
+		}
+		if !gatewayConnectionReady && ncName != commonservice.SystemVPCNetworkConfigurationName {
+			log.Info("skipping reconciling the network info because the system gateway connection is not ready", "NetworkInfo", req.NamespacedName)
+			return common.ResultRequeueAfter60sec, nil
 		}
 		lbProvider := r.Service.GetLBProvider()
 		createdVpc, err := r.Service.CreateOrUpdateVPC(obj, &nc, lbProvider)
diff --git a/pkg/controllers/networkinfo/networkinfo_controller_test.go b/pkg/controllers/networkinfo/networkinfo_controller_test.go
index f89cb51c5..131170cf7 100644
--- a/pkg/controllers/networkinfo/networkinfo_controller_test.go
+++ b/pkg/controllers/networkinfo/networkinfo_controller_test.go
@@ -193,7 +193,6 @@ func TestNetworkInfoReconciler_Reconcile(t *testing.T) {
 					return true, "", nil
 				})
 				patches.ApplyMethod(reflect.TypeOf(r.Service), "ValidateGatewayConnectionStatus", func(_ *vpc.VPCService, _ *servicecommon.VPCNetworkConfigInfo) (bool, string, error) {
-					assert.FailNow(t, "should not be called")
 					return true, "", nil
 				})
 				patches.ApplyMethod(reflect.TypeOf(r.Service), "CreateOrUpdateVPC", func(_ *vpc.VPCService, _ *v1alpha1.NetworkInfo, _ *servicecommon.VPCNetworkConfigInfo, _ vpc.LBProvider) (*model.Vpc, error) {