diff --git a/frontend/dashboard/src/components/integrations/seven-tv.vue b/frontend/dashboard/src/components/integrations/seven-tv.vue
index 35f18c927..72a7cd8a5 100644
--- a/frontend/dashboard/src/components/integrations/seven-tv.vue
+++ b/frontend/dashboard/src/components/integrations/seven-tv.vue
@@ -31,7 +31,7 @@ import { useSevenTv } from '@/components/integrations/use-seven-tv'
 import WithSettings from '@/components/integrations/variants/withSettings.vue'
 import RewardsSelector from '@/components/rewardsSelector.vue'
 import { useNaiveDiscrete } from '@/composables/use-naive-discrete'
-import CommandsList from '@/features/commands/commands.vue'
+import CommandsList from '@/features/commands/ui/list.vue'
 
 const { t } = useI18n()
 
diff --git a/frontend/dashboard/src/features/commands/commands.vue b/frontend/dashboard/src/features/commands/commands.vue
index 5e7071a71..06207f98c 100644
--- a/frontend/dashboard/src/features/commands/commands.vue
+++ b/frontend/dashboard/src/features/commands/commands.vue
@@ -23,13 +23,13 @@ const userCanManageCommands = useUserAccessFlagChecker(ChannelRolePermissionEnum
 const commandsManager = useCommandsApi()
 const { data: commandsResponse } = commandsManager.useQueryCommands()
 
-const excludedModules = ['7tv']
+const excludedModules: string[] = []
 
 const commandsFilter = ref('')
 const commands = computed(() => {
 	if (!commandsResponse.value?.commands) return []
 
-	const system = Array.isArray(route.params.system) ? route.params.system[0] : route.params.system
+	const system = (Array.isArray(route.params.system) ? route.params.system[0] : route.params.system) ?? ''
 
 	return commandsResponse.value.commands
 		.filter(c => {