diff --git a/src/app/components/dashboard-charts/dashboard-charts.component.html b/src/app/components/dashboard-charts/dashboard-charts.component.html
index 6e8dd56d956477b08d1a37b0f647bc6ba16c7559..8360ae8340b04d1e2962b3394327ac507514ce8d 100644
--- a/src/app/components/dashboard-charts/dashboard-charts.component.html
+++ b/src/app/components/dashboard-charts/dashboard-charts.component.html
@@ -1,18 +1,21 @@
 <mat-tab-group>
   @if (settings?.showETH) {
-  <mat-tab label="Frames">
-    <app-dashboard-chart-frames />
-  </mat-tab>
+    <mat-tab label="Frames">
+      <app-dashboard-chart-frames />
+    </mat-tab>
   }
-  <mat-tab label="Information Rate">
-    <app-dashboard-chart-information-rate />
-  </mat-tab>
-  @for (protocol of protocols(); track $index) {
-
-    <mat-tab [label]="protocol">
-      <app-dashboard-chart-protocol [protocolName]="protocol" />
+  @if (settings?.showCurrentValue || settings?.showMaxValue || settings?.showMinValue) {
+    <mat-tab label="Information Rate">
+      <app-dashboard-chart-information-rate />
     </mat-tab>
   }
+  @for (protocol of protocols(); track $index) {
+    @if (showProtocolChart(protocol)) {
+      <mat-tab [label]="protocol">
+        <app-dashboard-chart-protocol [protocolName]="protocol" />
+      </mat-tab>
+    }
+  }
 </mat-tab-group>
 
 <!--@todo: find other way to fix scrolling to the top of the page-->
diff --git a/src/app/components/dashboard-charts/dashboard-charts.component.ts b/src/app/components/dashboard-charts/dashboard-charts.component.ts
index f2d0bbd083ec9e5cf1b55156afc45f50833edfe9..a3327494b46a992d76b83bd78efabb5492bb73a2 100644
--- a/src/app/components/dashboard-charts/dashboard-charts.component.ts
+++ b/src/app/components/dashboard-charts/dashboard-charts.component.ts
@@ -42,4 +42,13 @@ export class DashboardChartsComponent {
       console.log('Settings received in charts:', this.settings);
     });
   }
+
+  showProtocolChart(protocolName: string): boolean {
+    const rows = this.settings;
+    return (
+      (rows?.showIPv4 && protocolName === 'ipv4') ||
+      (rows?.showIPv6 && protocolName === 'ipv6') ||
+      (rows?.showTCP && protocolName === 'tcp')
+    );
+  }
 }