diff --git a/lib/data/models/system_log_model.dart b/lib/data/models/system_log_model.dart
index 606a992d9..02bf70693 100644
--- a/lib/data/models/system_log_model.dart
+++ b/lib/data/models/system_log_model.dart
@@ -64,6 +64,8 @@ abstract class SystemLogEntity
     return '';
   }
 
+  bool get isVisible => eventId >= 20;
+
   String get event {
     switch (eventId) {
       case 10:
diff --git a/lib/ui/client/view/client_view_system_logs.dart b/lib/ui/client/view/client_view_system_logs.dart
index fa2b6bdc7..d40e4bab9 100644
--- a/lib/ui/client/view/client_view_system_logs.dart
+++ b/lib/ui/client/view/client_view_system_logs.dart
@@ -39,6 +39,7 @@ class _ClientViewSystemLogsState extends State<ClientViewSystemLogs> {
     }
 
     return ListView(
+      shrinkWrap: true,
       children: [
         ExpansionPanelList(
           expansionCallback: (int index, bool isExpanded) {
@@ -47,7 +48,9 @@ class _ClientViewSystemLogsState extends State<ClientViewSystemLogs> {
               _isExpanded[systemLog.id] = !isExpanded;
             });
           },
-          children: client.systemLogs.map((systemLog) {
+          children: client.systemLogs
+              .where((systemLog) => systemLog.isVisible)
+              .map((systemLog) {
             return ExpansionPanel(
               headerBuilder: (BuildContext context, bool isExpanded) {
                 return ListTile(