diff --git a/src/common/Checkbox/Checkbox.js b/src/common/Checkbox/Checkbox.js
index 9f9ba45db..96c29f334 100644
--- a/src/common/Checkbox/Checkbox.js
+++ b/src/common/Checkbox/Checkbox.js
@@ -4,18 +4,18 @@ const Icon = require('stremio-icons/dom');
 const Button = require('stremio/common/Button');
 const styles = require('./styles');
 
-const Checkbox = React.forwardRef((props, ref) => {
+const Checkbox = React.forwardRef(({ className, checked, children, ...props }, ref) => {
     return (
-        <Button {...props} ref={ref} className={classnames(props.className, styles['checkbox-container'], { 'checked': props.checked })}>
+        <Button {...props} ref={ref} className={classnames(className, styles['checkbox-container'], { 'checked': checked })}>
             {
-                props.checked ?
+                checked ?
                     <svg className={styles['icon']} viewBox={'0 0 100 100'}>
                         <Icon x={'10'} y={'10'} width={'80'} height={'80'} icon={'ic_check'} />
                     </svg>
                     :
                     <Icon className={styles['icon']} icon={'ic_box_empty'} />
             }
-            {props.children}
+            {children}
         </Button>
     );
 });