diff --git a/core/jazz_ui/src/app/pages/service-logs/service-logs.component.ts b/core/jazz_ui/src/app/pages/service-logs/service-logs.component.ts
index ffb5393914..81be784c1d 100644
--- a/core/jazz_ui/src/app/pages/service-logs/service-logs.component.ts
+++ b/core/jazz_ui/src/app/pages/service-logs/service-logs.component.ts
@@ -401,13 +401,16 @@ export class ServiceLogsComponent implements OnInit {
 	}
 
 	onRowClicked(row, index) {
-		for (var i = 0; i < this.logs.length; i++) {
-			var rowData = this.logs[i]
-
-			if (i == index) {
-				rowData['expanded'] = !rowData['expanded'];
-			} else{
-				rowData['expanded'] = false;
+		var rowData = this.logs[index];
+		if (rowData) {
+			rowData['expanded'] = !rowData['expanded'];
+			this.expandText = 'Collapse all';
+			for (var i = 0; i < this.logs.length; i++) {
+				var rowData = this.logs[i];
+				if (rowData['expanded'] == false) {
+					this.expandText = 'Expand all';
+					break;
+				}
 			}
 		}
 	}