diff --git a/src/routes/Player/ControlBar/ControlBar.js b/src/routes/Player/ControlBar/ControlBar.js
index 576250a6d..dfe6ad82b 100644
--- a/src/routes/Player/ControlBar/ControlBar.js
+++ b/src/routes/Player/ControlBar/ControlBar.js
@@ -9,55 +9,56 @@ const SubtitlesButton = require('./SubtitlesButton');
 const ShareButton = require('./ShareButton');
 const styles = require('./styles');
 
-const ControlBar = (props) => (
-    <div className={classnames(props.className, styles['control-bar-container'])}>
-        <SeekBar
-            className={styles['seek-bar']}
-            time={props.time}
-            duration={props.duration}
-            dispatch={props.dispatch}
-        />
-        <div className={styles['control-bar-buttons-container']}>
-            <PlayPauseButton
-                className={styles['control-bar-button']}
-                paused={props.paused}
+const ControlBar = (props) => {
+    return (
+        <div className={classnames(props.className, styles['control-bar-container'])}>
+            <SeekBar
+                className={styles['seek-bar']}
+                time={props.time}
+                duration={props.duration}
                 dispatch={props.dispatch}
             />
-            <MuteButton
-                className={styles['control-bar-button']}
-                volume={props.volume}
-                muted={props.muted}
-                dispatch={props.dispatch}
-            />
-            <VolumeSlider
-                className={styles['volume-slider']}
-                volume={props.volume}
-                dispatch={props.dispatch}
-            />
-            <div className={styles['spacing']} />
-            <SubtitlesButton
-                className={styles['control-bar-button']}
-                modalContainerClassName={classnames(styles['modal-container'], props.modalContainerClassName)}
-                subtitlesTracks={props.subtitlesTracks}
-                selectedSubtitlesTrackId={props.selectedSubtitlesTrackId}
-                subtitlesSize={props.subtitlesSize}
-                subtitlesDelay={props.subtitlesDelay}
-                subtitlesTextColor={props.subtitlesTextColor}
-                subtitlesBackgroundColor={props.subtitlesBackgroundColor}
-                subtitlesOutlineColor={props.subtitlesOutlineColor}
-                dispatch={props.dispatch}
-            />
-            <ShareButton
-                className={styles['control-bar-button']}
-                modalContainerClassName={classnames(styles['modal-container'], props.modalContainerClassName)}
-            />
+            <div className={styles['control-bar-buttons-container']}>
+                <PlayPauseButton
+                    className={styles['control-bar-button']}
+                    paused={props.paused}
+                    dispatch={props.dispatch}
+                />
+                <MuteButton
+                    className={styles['control-bar-button']}
+                    volume={props.volume}
+                    muted={props.muted}
+                    dispatch={props.dispatch}
+                />
+                <VolumeSlider
+                    className={styles['volume-slider']}
+                    volume={props.volume}
+                    dispatch={props.dispatch}
+                />
+                <div className={styles['spacing']} />
+                <SubtitlesButton
+                    className={styles['control-bar-button']}
+                    modalContainerClassName={classnames(styles['modal-container'], props.modalContainerClassName)}
+                    subtitlesTracks={props.subtitlesTracks}
+                    selectedSubtitlesTrackId={props.selectedSubtitlesTrackId}
+                    subtitlesSize={props.subtitlesSize}
+                    subtitlesDelay={props.subtitlesDelay}
+                    subtitlesTextColor={props.subtitlesTextColor}
+                    subtitlesBackgroundColor={props.subtitlesBackgroundColor}
+                    subtitlesOutlineColor={props.subtitlesOutlineColor}
+                    dispatch={props.dispatch}
+                />
+                <ShareButton
+                    className={styles['control-bar-button']}
+                    modalContainerClassName={classnames(styles['modal-container'], props.modalContainerClassName)}
+                />
+            </div>
         </div>
-    </div>
-);
+    );
+};
 
 ControlBar.propTypes = {
     className: PropTypes.string,
-    modalContainerClassName: PropTypes.string,
     paused: PropTypes.bool,
     time: PropTypes.number,
     duration: PropTypes.number,
@@ -67,7 +68,7 @@ ControlBar.propTypes = {
         id: PropTypes.string.isRequired,
         label: PropTypes.string.isRequired,
         origin: PropTypes.string.isRequired
-    })).isRequired,
+    })),
     selectedSubtitlesTrackId: PropTypes.string,
     subtitlesSize: PropTypes.number,
     subtitlesDelay: PropTypes.number,
@@ -77,8 +78,4 @@ ControlBar.propTypes = {
     dispatch: PropTypes.func
 };
 
-ControlBar.defaultProps = {
-    subtitlesTracks: Object.freeze([])
-};
-
 module.exports = ControlBar;