diff --git a/frontend/app/components/shared/TrackerUpdateMessage/TrackerUpdateMessage.js b/frontend/app/components/shared/TrackerUpdateMessage/TrackerUpdateMessage.js
index a5fe4411c..787751d79 100644
--- a/frontend/app/components/shared/TrackerUpdateMessage/TrackerUpdateMessage.js
+++ b/frontend/app/components/shared/TrackerUpdateMessage/TrackerUpdateMessage.js
@@ -1,18 +1,25 @@
-import React from 'react'
+import React, { useEffect } from 'react'
 import { Icon } from 'UI'
 import { connect } from 'react-redux'
 import { withRouter } from 'react-router-dom';
 import { onboarding as onboardingRoute } from 'App/routes'
 import { withSiteId } from 'App/routes';
+import { isGreaterOrEqualVersion } from 'App/utils'
 
 const TrackerUpdateMessage= (props) => {
-  // const { site } = props;
-  const { site, sites, match: { params: { siteId } } } = props;
+  const [needUpdate, setNeedUpdate] = React.useState(false)
+  const { sites, match: { params: { siteId } } } = props;
   const activeSite = sites.find(s => s.id == siteId);
-  const hasSessions = !!activeSite && !activeSite.recorded;
-  const appVersionInt = parseInt(window.ENV.TRACKER_VERSION.split(".").join(""))
-  const trackerVersionInt = site.trackerVersion ? parseInt(site.trackerVersion.split(".").join("")) : 0
-  const needUpdate = !hasSessions && appVersionInt > trackerVersionInt;
+  
+  useEffect(() => {
+    if (!activeSite || !activeSite.trackerVersion) return;
+
+    const isLatest = isGreaterOrEqualVersion(activeSite.trackerVersion, window.ENV.TRACKER_VERSION);
+    if (!isLatest && activeSite.recorded) {
+      setNeedUpdate(true)
+    }
+  }, [activeSite])
+
   return needUpdate ? (
     <>
       {(
diff --git a/frontend/app/utils.js b/frontend/app/utils.js
index 52b2a9d6a..4c1a0c607 100644
--- a/frontend/app/utils.js
+++ b/frontend/app/utils.js
@@ -226,4 +226,10 @@ export const iceServerConfigFromString = (str) => {
       return server
     }
   })
+}
+
+export const isGreaterOrEqualVersion = (version, compareTo) => {
+  const [major, minor, patch] = version.split("-")[0].split('.');
+  const [majorC, minorC, patchC] = compareTo.split("-")[0].split('.');
+  return (major > majorC) || (major === majorC && minor > minorC) || (major === majorC && minor === minorC && patch >= patchC);
 }
\ No newline at end of file