diff --git a/frontend/src/plugins/runtime/loader.ts b/frontend/src/plugins/runtime/loader.ts
index 8329d4a..ac9e071 100644
--- a/frontend/src/plugins/runtime/loader.ts
+++ b/frontend/src/plugins/runtime/loader.ts
@@ -118,19 +118,19 @@ function safePluginId(entry: unknown): string {
 }
 
 function commandIdsFromContributes(contributes: PluginContributionDto): Set<string> {
-  return new Set(
-    contributes.menuItems.flatMap((item) => {
-      const command = objectOrEmpty(item).command;
-      return nonEmptyString(command) ? [command] : [];
+  return new Set<string>(
+    contributes.menuItems.flatMap<string>((item) => {
+      const command = nonEmptyString(objectOrEmpty(item).command);
+      return command ? [command] : [];
     }),
   );
 }
 
 function layoutTypesFromContributes(contributes: PluginContributionDto): Set<string> {
-  return new Set(
-    contributes.layouts.flatMap((layout) => {
-      const type = objectOrEmpty(layout).type;
-      return nonEmptyString(type) ? [type] : [];
+  return new Set<string>(
+    contributes.layouts.flatMap<string>((layout) => {
+      const type = nonEmptyString(objectOrEmpty(layout).type);
+      return type ? [type] : [];
     }),
   );
 }