diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index d3dbfd7ac0d..fb12bb2fb8a 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -18019,6 +18019,8 @@
                         		groupbyObj.routerCount = routerCountFromAllPages;
                         		
                             	routerCountFromFirstPageToCurrentPage += json.listroutersresponse.router.length;      	        	                                                		
+                        	} else {
+                        		groupbyObj.routerCount = routerCountFromAllPages;
                         	}
                         }    	                                                		
                 	});    	                                                	
@@ -18047,13 +18049,31 @@
                                 		projectid: -1
                                 	}),
                             		success: function(json) {  
-                            			routerCountFromFirstPageToCurrentPage += json.listroutersresponse.router.length;    	                                                    			                                                    			
-                            			var items = json.listroutersresponse.router;
-                            			for (var k = 0; k < items.length; k++) {    	                                                    				
-                            				if (items[k].requiresupgrade) {
-                            					routerRequiresUpgrade++;
-                            				}
-                            			}       	    	                                                    			
+                            			if (json.listroutersresponse.count != undefined) {                            		                                            		    	                                            		
+                                    		routerCountFromAllPages += json.listroutersresponse.count;    
+                                    		groupbyObj.routerCount = routerCountFromAllPages;
+                                    		
+                                        	routerCountFromFirstPageToCurrentPage += json.listroutersresponse.router.length;      	        	                                                		
+                                    	} else {
+                                    		groupbyObj.routerCount = routerCountFromAllPages;
+                                    	}
+                            			
+                            			
+                            			if (json.listroutersresponse.count != undefined) {                            		                                            		    	                                            		
+                                    		routerCountFromAllPages += json.listroutersresponse.count;    
+                                    		groupbyObj.routerCount = routerCountFromAllPages;
+                                    		
+                                        	routerCountFromFirstPageToCurrentPage += json.listroutersresponse.router.length;                                                        			                                                    			
+	                            			
+	                            			var items = json.listroutersresponse.router;
+	                            			for (var k = 0; k < items.length; k++) {    	                                                    				
+	                            				if (items[k].requiresupgrade) {
+	                            					routerRequiresUpgrade++;
+	                            				}
+	                            			}  
+                            			} else {
+                                    		groupbyObj.routerCount = routerCountFromAllPages;
+                                    	}
                             		}
                     			});