diff --git a/ui/js/component/header/index.js b/ui/js/component/header/index.js
index 280db1415..fe81b277c 100644
--- a/ui/js/component/header/index.js
+++ b/ui/js/component/header/index.js
@@ -1,7 +1,6 @@
 import React from "react";
 import { formatCredits } from "util/formatCredits";
 import { connect } from "react-redux";
-import { selectUpgradeSkipped } from "selectors/app";
 import {
   selectIsBackDisabled,
   selectIsForwardDisabled,
@@ -12,16 +11,17 @@ import {
   doHistoryBack,
   doHistoryForward,
 } from "actions/navigation";
-import { doDownloadUpgrade } from "actions/app";
 import Header from "./view";
+import { selectIsUpgradeAvailable } from "../../selectors/app";
+import { doDownloadUpgrade } from "../../actions/app";
 
 const select = state => ({
   isBackDisabled: selectIsBackDisabled(state),
   isForwardDisabled: selectIsForwardDisabled(state),
+  isUpgradeAvailable: selectIsUpgradeAvailable(state),
   balance: formatCredits(selectBalance(state) || 0, 1),
   publish: __("Publish"),
   upgradeLabel: __("Upgrade App"),
-  upgradeSkipped: selectUpgradeSkipped(state),
 });
 
 const perform = dispatch => ({
diff --git a/ui/js/component/header/view.jsx b/ui/js/component/header/view.jsx
index ffb4ff729..3f8853aa0 100644
--- a/ui/js/component/header/view.jsx
+++ b/ui/js/component/header/view.jsx
@@ -6,14 +6,14 @@ export const Header = props => {
   const {
     balance,
     back,
-    downloadUpgrade,
     forward,
     isBackDisabled,
     isForwardDisabled,
+    isUpgradeAvailable,
     navigate,
     publish,
     upgradeLabel,
-    upgradeSkipped,
+    downloadUpgrade,
   } = props;
   return (
     <header id="header">
@@ -80,17 +80,13 @@ export const Header = props => {
           title={__("Settings")}
         />
       </div>
-      {upgradeSkipped ? (
-        <div className="header__item">
-          <Link
-            onClick={() => downloadUpgrade()}
-            button="primary button--flat"
-            icon="icon-arrow-up"
-            label={upgradeLabel}
-          />
-        </div>
-      ) : (
-        ""
+      {isUpgradeAvailable && (
+        <Link
+          onClick={() => downloadUpgrade()}
+          button="primary button--flat"
+          icon="icon-arrow-up"
+          label={upgradeLabel}
+        />
       )}
     </header>
   );