diff --git a/src/stories/components/ToggleSwitch.stories.tsx b/src/stories/components/ToggleSwitch.stories.tsx
index c96a87f6..dee5ba4a 100644
--- a/src/stories/components/ToggleSwitch.stories.tsx
+++ b/src/stories/components/ToggleSwitch.stories.tsx
@@ -15,6 +15,6 @@ type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
     args: {
-        isChecked: true, // The SwitchButton will start in the "checked" state
+        isChecked: true,
     },
 };
diff --git a/src/views/components/common/SwitchButton.tsx b/src/views/components/common/SwitchButton.tsx
index 817aa142..8878be71 100644
--- a/src/views/components/common/SwitchButton.tsx
+++ b/src/views/components/common/SwitchButton.tsx
@@ -1,15 +1,13 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { Switch } from '@headlessui/react';
-import { useEffect } from 'react';
 
-interface ToggleSwitchProps {
-    // label: string;
-    isChecked: boolean;
-    // onChange: (checked: boolean) => void;
-}
+type ToggleSwitchProps = {
+    isChecked?: boolean;
+    // onChange?: (checked: boolean) => void;
+};
 
 const SwitchButton: React.FC<ToggleSwitchProps> = ({ isChecked = true }) => {
-    const [enabled, setEnabled] = useState(true);
+    const [enabled, setEnabled] = useState(isChecked);
 
     useEffect(() => {
         setEnabled(isChecked);