diff --git a/packages/components/src/components/form/Switch/Switch.tsx b/packages/components/src/components/form/Switch/Switch.tsx
index e02c6e91007..aa84c89bfb1 100755
--- a/packages/components/src/components/form/Switch/Switch.tsx
+++ b/packages/components/src/components/form/Switch/Switch.tsx
@@ -114,7 +114,7 @@ const Label = styled.label<{
 export interface SwitchProps {
     isChecked: boolean;
     label?: ReactNode;
-    onChange: (isChecked?: boolean) => void;
+    onChange: (isChecked: boolean) => void;
     isDisabled?: boolean;
     isAlert?: boolean;
     isSmall?: boolean; // TODO: legacy prop
diff --git a/packages/suite/src/views/settings/SettingsDebug/CheckFirmwareAuthenticity.tsx b/packages/suite/src/views/settings/SettingsDebug/CheckFirmwareAuthenticity.tsx
index eb26d7ff25c..47fbcb17e7a 100644
--- a/packages/suite/src/views/settings/SettingsDebug/CheckFirmwareAuthenticity.tsx
+++ b/packages/suite/src/views/settings/SettingsDebug/CheckFirmwareAuthenticity.tsx
@@ -15,20 +15,20 @@ export const CheckFirmwareAuthenticity = () => {
     const isFirmwareHashCheckEnabled = useSelector(selectIsFirmwareHashCheckEnabled);
     const isFirmwareRevisionCheckEnabled = useSelector(selectIsFirmwareRevisionCheckEnabled);
 
-    const toggleEntropyCheck = (isChecked?: boolean) =>
+    const toggleEntropyCheck = (isChecked: boolean) =>
         dispatch({
             type: SUITE.TOGGLE_ENTROPY_CHECK,
-            payload: !!isChecked,
+            payload: isChecked,
         });
-    const toggleFirmwareHashCheck = (isChecked?: boolean) =>
+    const toggleFirmwareHashCheck = (isChecked: boolean) =>
         dispatch({
             type: SUITE.TOGGLE_FIRMWARE_HASH_CHECK,
-            payload: !!isChecked,
+            payload: isChecked,
         });
-    const toggleFirmwareRevisionCheck = (isChecked?: boolean) =>
+    const toggleFirmwareRevisionCheck = (isChecked: boolean) =>
         dispatch({
             type: SUITE.TOGGLE_FIRMWARE_REVISION_CHECK,
-            payload: !!isChecked,
+            payload: isChecked,
         });
 
     return (
diff --git a/packages/suite/src/views/settings/SettingsDebug/DeviceAuthenticity.tsx b/packages/suite/src/views/settings/SettingsDebug/DeviceAuthenticity.tsx
index 985caeba1ac..ada854dbeed 100644
--- a/packages/suite/src/views/settings/SettingsDebug/DeviceAuthenticity.tsx
+++ b/packages/suite/src/views/settings/SettingsDebug/DeviceAuthenticity.tsx
@@ -8,7 +8,7 @@ export const DeviceAuthenticity = () => {
     const dispatch = useDispatch();
     const debug = useSelector(state => state.suite.settings.debug);
 
-    const handleChange = (state?: boolean) =>
+    const handleChange = (state: boolean) =>
         dispatch(setDebugMode({ isUnlockedBootloaderAllowed: state }));
 
     return (