diff --git a/js/components/App.js b/js/components/App.js
index b9304e1f..73be8f14 100644
--- a/js/components/App.js
+++ b/js/components/App.js
@@ -31,8 +31,9 @@ const App = ({
     }
     switch (id) {
       case "main":
-        // TODO: Pass only the analyser node
-        return <MainWindow mediaPlayer={media} filePickers={filePickers} />;
+        return (
+          <MainWindow analyser={media._analyser} filePickers={filePickers} />
+        );
       case "equalizer":
         return <EqualizerWindow />;
       case "playlist":
diff --git a/js/components/MainWindow/index.js b/js/components/MainWindow/index.js
index b6cf78ef..fbe51f90 100644
--- a/js/components/MainWindow/index.js
+++ b/js/components/MainWindow/index.js
@@ -114,7 +114,7 @@ export class MainWindow extends React.Component {
           />
           <Time />
         </div>
-        <Visualizer analyser={this.props.mediaPlayer._analyser} />
+        <Visualizer analyser={this.props.analyser} />
         <div className="media-info">
           <Marquee />
           <Kbps />