diff --git a/internal/cli/logs.go b/internal/cli/logs.go
index 7d915b246..7dfd02dc8 100644
--- a/internal/cli/logs.go
+++ b/internal/cli/logs.go
@@ -66,7 +66,7 @@ Show the tenant logs.
 						list, err = cli.api.Log.List(
 							management.Query(fmt.Sprintf("log_id:[* TO %s]", lastLogID)),
 							management.Parameter("page", "0"),
-							management.Parameter("per_page", "100"),
+							management.Parameter("per_page", "1000"),
 							management.Parameter("sort", "date:-1"),
 						)
 						if err != nil {
diff --git a/internal/display/logs.go b/internal/display/logs.go
index 4308d0c4b..cb6bbb2cd 100644
--- a/internal/display/logs.go
+++ b/internal/display/logs.go
@@ -34,7 +34,11 @@ func (v *logView) getConnection() string {
 	if ok && len(prompt) > 0 {
 		dict, ok := prompt[0].(map[string]interface{})
 		if ok {
-			return dict["connection"].(string)
+			v, ok := dict["connection"].(string)
+			if ok {
+				return v
+			}
+			return notApplicable
 		} else {
 			return notApplicable
 		}