diff --git a/apps/meteor/client/views/marketplace/components/CategoryFilter/CategoryDropDownList.tsx b/apps/meteor/client/views/marketplace/components/CategoryFilter/CategoryDropDownList.tsx
index 2ad274e65b1b5..f096930b26020 100644
--- a/apps/meteor/client/views/marketplace/components/CategoryFilter/CategoryDropDownList.tsx
+++ b/apps/meteor/client/views/marketplace/components/CategoryFilter/CategoryDropDownList.tsx
@@ -14,7 +14,7 @@ const CategoryDropDownList = ({ categories, onSelected }: CategoryDropDownListPr
 						</Box>
 					)}
 					{category.items.map((item) => (
-						<Option key={item.id} {...({ label: item.label } as any)} onClick={(): void => onSelected(item)}>
+					<Option key={item.id} label={item.label} onClick={(): void => onSelected(item)}>
 							<CheckBox checked={item.checked} onChange={(): void => onSelected(item)} />
 						</Option>
 					))}
diff --git a/apps/meteor/client/views/marketplace/hooks/useInstallApp.tsx b/apps/meteor/client/views/marketplace/hooks/useInstallApp.tsx
index 29aefa198c46a..da55f1b51211e 100644
--- a/apps/meteor/client/views/marketplace/hooks/useInstallApp.tsx
+++ b/apps/meteor/client/views/marketplace/hooks/useInstallApp.tsx
@@ -40,7 +40,7 @@ export const useInstallApp = (file: File): { install: () => void; isInstalling:
 				return uploadUpdateEndpoint(fileData);
 			}
 
-			return uploadAppEndpoint(fileData) as any;
+			return uploadAppEndpoint(fileData) as unknown as Promise<{ app: App }>;
 		},
 
 		onSuccess: (data: { app: App }) => {
diff --git a/apps/meteor/client/views/room/composer/hooks/useComposerBoxPopupQueries.ts b/apps/meteor/client/views/room/composer/hooks/useComposerBoxPopupQueries.ts
index 76a68f14d85b1..11809a1cf6365 100644
--- a/apps/meteor/client/views/room/composer/hooks/useComposerBoxPopupQueries.ts
+++ b/apps/meteor/client/views/room/composer/hooks/useComposerBoxPopupQueries.ts
@@ -15,11 +15,15 @@ export const useComposerBoxPopupQueries = <T extends { _id: string; sort?: numbe
 
 	const shouldPopupPreview = useEnablePopupPreview(filter, popup);
 
+	const hasCmd = (filter: unknown): filter is { cmd: string } => 
+		typeof filter === 'object' && filter !== null && 'cmd' in filter && typeof (filter as Record<string, unknown>).cmd === 'string';
+
 	const enableQuery =
 		!popup ||
 		(popup.preview &&
-			Boolean(slashCommands.commands[(filter as any)?.cmd]) &&
-			slashCommands.commands[(filter as any)?.cmd].providesPreview) ||
+			hasCmd(filter) &&
+			Boolean(slashCommands.commands[filter.cmd]) &&
+			slashCommands.commands[filter.cmd].providesPreview) ||
 		shouldPopupPreview;
 
 	const queries = useQueries({