diff --git a/application/src/main/data/json/tenant/dashboards/gateways.json b/application/src/main/data/json/tenant/dashboards/gateways.json
index 42c4f199b5..8f426b1624 100644
--- a/application/src/main/data/json/tenant/dashboards/gateways.json
+++ b/application/src/main/data/json/tenant/dashboards/gateways.json
@@ -880,7 +880,7 @@
             "isConnectorLog": true,
             "connectorLogState": "connector_logs"
           },
-          "title": "Gateway Logs",
+          "title": "${entityNameLogs}",
           "showTitleIcon": false,
           "dropShadow": true,
           "enableFullscreen": true,
diff --git a/ui-ngx/src/app/core/utils.ts b/ui-ngx/src/app/core/utils.ts
index dc9ed5004b..a15e9462f3 100644
--- a/ui-ngx/src/app/core/utils.ts
+++ b/ui-ngx/src/app/core/utils.ts
@@ -415,6 +415,8 @@ export const createLabelFromDatasource = (datasource: Datasource, pattern: strin
       label = label.replace(variable, datasource.name);
     } else if (variableName === 'entityName') {
       label = label.replace(variable, datasource.entityName);
+    } else if (variableName === 'entityNameLogs') {
+      label = label.replace(variable, datasource.entityName + ' Logs');
     } else if (variableName === 'deviceName') {
       label = label.replace(variable, datasource.entityName);
     } else if (variableName === 'entityLabel') {