diff --git a/pkg/webui/console/containers/sidebar/navigation/app-side-navigation.js b/pkg/webui/console/containers/sidebar/navigation/app-side-navigation.js
index 3bb59a0328..717e376eee 100644
--- a/pkg/webui/console/containers/sidebar/navigation/app-side-navigation.js
+++ b/pkg/webui/console/containers/sidebar/navigation/app-side-navigation.js
@@ -73,7 +73,13 @@ const AppSideNavigation = () => {
   const rights = useSelector(selectApplicationRights)
   const natsDisabled = useSelector(selectNatsProviderDisabled)
   const mqttDisabled = useSelector(selectMqttProviderDisabled)
-  const topEntityFilter = useCallback(e => e.id.startsWith(appId), [appId])
+  const topEntityFilter = useCallback(
+    e => {
+      const separatedAppId = e.id.split('/')[0]
+      return separatedAppId === appId
+    },
+    [appId],
+  )
   const topEntities = useSelector(state => selectEndDeviceTopEntities(state, topEntityFilter))
 
   if (!app) {
diff --git a/pkg/webui/console/store/selectors/top-entities.js b/pkg/webui/console/store/selectors/top-entities.js
index 4ce5d197b7..b043e063f7 100644
--- a/pkg/webui/console/store/selectors/top-entities.js
+++ b/pkg/webui/console/store/selectors/top-entities.js
@@ -178,17 +178,20 @@ export const selectTopEntities = createSelector(
 )
 
 const createTopEntityByTypeSelector = entityType =>
-  createSelector([selectTopEntities, (_, filter) => filter], (topEntities, filter) => {
-    if (!topEntities[entityType]) {
-      return []
-    }
+  createSelector(
+    [selectTopEntities, (_, topEntityFilter) => topEntityFilter],
+    (topEntities, topEntityFilter) => {
+      if (!topEntities[entityType]) {
+        return []
+      }
 
-    const filteredEntities = filter
-      ? topEntities[entityType].filter(filter)
-      : topEntities[entityType]
+      const filteredEntities = topEntityFilter
+        ? topEntities[entityType].filter(topEntityFilter)
+        : topEntities[entityType]
 
-    return filteredEntities
-  })
+      return filteredEntities
+    },
+  )
 
 export const selectTopEntitiesAll = state => selectTopEntities(state)[ALL]