diff --git a/src/client/components/Badges.tsx b/src/client/components/Badges.tsx
index 71399115..bf5b0f7e 100644
--- a/src/client/components/Badges.tsx
+++ b/src/client/components/Badges.tsx
@@ -86,14 +86,12 @@ export const ComponentStateBadge = (props: ComponentProps<typeof Badge> & {
         setComponentState(data.state);
     },[data.state, setComponentState]);
 
-    if(props.componentId !== undefined && props.live) {
-        const client = useSSEContext<MsSseEvent>();
-        const connection = useSSEEvent(client, 'componentUpdate', (payload) => {
-            if(payload.componentId === props.componentId && payload.data.state !== undefined) {
-                setComponentState(payload.data.state);
-            }
-        });
-    }
+    const client = useSSEContext<MsSseEvent>();
+    const connection = useSSEEvent(client, 'componentUpdate', (payload) => {
+        if(props.componentId !== undefined && props.live && payload.componentId === props.componentId && payload.data.state !== undefined) {
+            setComponentState(payload.data.state);
+        }
+    });
 
     let badgeColor = undefined;
 
diff --git a/src/client/components/chakraPlayer/Player.tsx b/src/client/components/chakraPlayer/Player.tsx
index 2da01d2f..f705bbc7 100644
--- a/src/client/components/chakraPlayer/Player.tsx
+++ b/src/client/components/chakraPlayer/Player.tsx
@@ -18,6 +18,7 @@ import LinearProgress from '@mui/material/LinearProgress';
 import { InfoTip, ToggleTip } from "../ToggleTip";
 import { tanQueries } from "../../queries";
 import dayjs from "dayjs";
+import { MSErrorBoundary } from "../ErrorBoundary";
 
 export interface PlayerProps {
     data: SourcePlayerJson & {expiration?: string}
@@ -149,45 +150,49 @@ export const ChakraPlayer = (props: PlayerProps) => {
 
     const bufferTip = positionBuffer !== undefined ? <InfoTip positioning={{placement: "bottom-start"}} buttonProps={{height: 'var(--chakra-sizes-4)'}} content={bufferExplanation}/> : null;
      
-    return <Container className="playerContainer" bg="bg.emphasized" borderWidth="1px" p="2" py="3" rounded="md">
-    <Stack gap="2">
-            <Flex gap="4" align="center">
-                {playArt !== undefined ? <Image minWidth="48px" flex="0" height="100%" width="100%" src={playArt}></Image> : null}
-                <Center flex="1">
-                    <Stack textAlign="center">
-                        <Heading textWrap="balance" size="md">{calculated !== 'stopped' ? track : '-'}</Heading>
-                        <TextMuted>{calculated !== 'stopped' ? artists.map(x => x.name).join(' / ') : '-'}</TextMuted>
-                    </Stack>
-                </Center>
-            </Flex>
-            <HStack gap="5">
-                <Text textStyle="sm">{positionTimestamp}</Text>
-                <Box flex="1">
-                <LinearProgress
-                variant={indeterminate ? undefined : "buffer"}
-                
-                value={positionProgress}
-                valueBuffer={Math.max(bufferProgress ?? positionProgress, positionProgress)}
-                />
-                </Box>
-                <Text textStyle="xs">{durationTimestamp}</Text>
-            </HStack>
-            {/* <Progress.Root value={indeterminate || data.position === undefined || duration === undefined ? null : (data.position/duration) * 100} size="sm">
-                <HStack gap="5">
-                    <Progress.Label>{positionTimestamp}</Progress.Label>
-                    <Progress.Track flex="1">
-                        <Progress.Range />
-                    </Progress.Track>
-                    <Progress.ValueText>{durationTimestamp}</Progress.ValueText>
-                </HStack>
-            </Progress.Root> */}
-            <Flex alignItems="center">
-                <TextMuted>{['unknown', 'playing'].includes(calculated) && isNowPlaying ? 'Now Playing' : capitalize(calculated)}{!isNowPlaying ? bufferTip : null}</TextMuted>
-                <Spacer />
-                <TextMuted>Listened: {isNowPlaying !== true && calculated !== 'stopped' && listenedDuration !== null ? `${listenedDuration.toFixed(0)}s` : '-'}{durPer}</TextMuted>
-            </Flex>
-        </Stack>
-        </Container>
+    return (
+    <MSErrorBoundary>
+        <Container className="playerContainer" bg="bg.emphasized" borderWidth="1px" p="2" py="3" rounded="md">
+            <Stack gap="2">
+                    <Flex gap="4" align="center">
+                        {playArt !== undefined ? <Image minWidth="48px" flex="0" height="100%" width="100%" src={playArt}></Image> : null}
+                        <Center flex="1">
+                            <Stack textAlign="center">
+                                <Heading textWrap="balance" size="md">{calculated !== 'stopped' ? track : '-'}</Heading>
+                                <TextMuted>{calculated !== 'stopped' ? artists.map(x => x.name).join(' / ') : '-'}</TextMuted>
+                            </Stack>
+                        </Center>
+                    </Flex>
+                    <HStack gap="5">
+                        <Text textStyle="sm">{positionTimestamp}</Text>
+                        <Box flex="1">
+                        <LinearProgress
+                        variant={indeterminate ? undefined : "buffer"}
+                        
+                        value={positionProgress}
+                        valueBuffer={Math.max(bufferProgress ?? positionProgress, positionProgress)}
+                        />
+                        </Box>
+                        <Text textStyle="xs">{durationTimestamp}</Text>
+                    </HStack>
+                    {/* <Progress.Root value={indeterminate || data.position === undefined || duration === undefined ? null : (data.position/duration) * 100} size="sm">
+                        <HStack gap="5">
+                            <Progress.Label>{positionTimestamp}</Progress.Label>
+                            <Progress.Track flex="1">
+                                <Progress.Range />
+                            </Progress.Track>
+                            <Progress.ValueText>{durationTimestamp}</Progress.ValueText>
+                        </HStack>
+                    </Progress.Root> */}
+                    <Flex alignItems="center">
+                        <TextMuted>{['unknown', 'playing'].includes(calculated) && isNowPlaying ? 'Now Playing' : capitalize(calculated)}{!isNowPlaying ? bufferTip : null}</TextMuted>
+                        <Spacer />
+                        <TextMuted>Listened: {isNowPlaying !== true && calculated !== 'stopped' && listenedDuration !== null ? `${listenedDuration.toFixed(0)}s` : '-'}{durPer}</TextMuted>
+                    </Flex>
+                </Stack>
+            </Container>
+        </MSErrorBoundary>
+        )
     
 }
 
diff --git a/src/client/components/msComponent/MSComponentDetailed.tsx b/src/client/components/msComponent/MSComponentDetailed.tsx
index 80a656e1..127f7798 100644
--- a/src/client/components/msComponent/MSComponentDetailed.tsx
+++ b/src/client/components/msComponent/MSComponentDetailed.tsx
@@ -73,28 +73,6 @@ export const MSComponentStats = (props: { data?: ComponentCommonApiJson, live?:
 
 const stateIsStarted = (state: ComponentState): boolean => state <= COMPONENT_STATE.MUTED;
 
-const ComponentSettings = (props: { data: ComponentCommonApiJson }) => {
-    const [startChecked, setStartChecked] = useState<boolean>(stateIsStarted(props.data.state));
-    return (
-        <Stack>
-            <Switch.Root
-                checked={startChecked}
-                onCheckedChange={(e) => setStartChecked(e.checked)}
-            >
-                <Switch.HiddenInput />
-                <Switch.Control>
-                    <Switch.Thumb>
-                        <Switch.ThumbIndicator fallback={<XIcon color="black" />}>
-                            <CheckIcon />
-                        </Switch.ThumbIndicator>
-                    </Switch.Thumb>
-                </Switch.Control>
-                <Switch.Label>Start</Switch.Label>
-            </Switch.Root>
-        </Stack>
-    )
-}
-
 const componentStateMenuItem = (Icon: IconType, value: string, name?: string) => (props: Pick<MenuItemProps, 'disabled'> = {}) => {
     return (<Menu.Item key={value} value={value} {...props}><Icon/><Box flex="1">{name ?? capitalize(value)}</Box></Menu.Item>);
 }
@@ -208,9 +186,9 @@ export const ComponentDetailedDesktop = (props: {data?: ComponentCommonApiJson,
             <Flex justifyContent="flex-end" rowGap="6" flexDirection="row-reverse" wrap="wrap">
                 <Box marginEnd="auto"><MSComponentStats {...props}/></Box>
             </Flex>
-            {props.live ? <PlayersContainerFetchable nowPlaying={isSource ? undefined : true} data={props.data}/> : <PlayersContainer nowPlaying={isSource ? undefined : true} data={props.data} live={props.live}/>}
+            <MSErrorBoundary>{props.live ? <PlayersContainerFetchable nowPlaying={isSource ? undefined : true} data={props.data}/> : <PlayersContainer nowPlaying={isSource ? undefined : true} data={props.data} live={props.live}/>}</MSErrorBoundary>
             <Heading size="3xl" width="100%">{isComponentTypeSource(props.data.mode) ? 'Plays' : 'Scrobbles'}</Heading>
-            <ListContainerFilterable render="virtDynamic" componentType={props.data.mode} componentId={props.data.id}/>
+            <MSErrorBoundary><ListContainerFilterable render="virtDynamic" componentType={props.data.mode} componentId={props.data.id}/></MSErrorBoundary>
         </Flex>
         </MSErrorBoundary>
     )