diff --git a/monkey/monkey_island/cc/ui/src/components/Main.tsx b/monkey/monkey_island/cc/ui/src/components/Main.tsx
index ea584f088..7635f3e4c 100644
--- a/monkey/monkey_island/cc/ui/src/components/Main.tsx
+++ b/monkey/monkey_island/cc/ui/src/components/Main.tsx
@@ -33,7 +33,7 @@ import _ from "lodash";
 
 let notificationIcon = require('../images/notification-logo-512x512.png');
 
-const Routes = {
+export const Routes = {
   LandingPage: '/landing-page',
   GettingStartedPage: '/',
   Report: '/report',
diff --git a/monkey/monkey_island/cc/ui/src/components/pages/ReportPage.js b/monkey/monkey_island/cc/ui/src/components/pages/ReportPage.js
index aacc70328..c45dbe7e7 100644
--- a/monkey/monkey_island/cc/ui/src/components/pages/ReportPage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/ReportPage.js
@@ -16,6 +16,7 @@ class ReportPageComponent extends AuthComponent {
   constructor(props) {
     super(props);
     this.sections = ['security', 'zeroTrust', 'attack', 'ransomware'];
+
     this.state = {
       securityReport: {},
       attackReport: {},
@@ -28,6 +29,7 @@ class ReportPageComponent extends AuthComponent {
         {key: 'zeroTrust', title: 'Zero trust report'},
         {key: 'attack', title: 'ATT&CK report'}]
     };
+
   }
 
   static selectReport(reports) {
@@ -65,9 +67,6 @@ class ReportPageComponent extends AuthComponent {
             ransomwareReport: res
           });
         });
-      if (this.shouldShowRansomwareReport(this.state.ransomwareReport)) {
-        this.addRansomwareReportTab();
-      }
     }
   }
 
@@ -96,32 +95,6 @@ class ReportPageComponent extends AuthComponent {
     return ztReport
   };
 
-  shouldShowRansomwareReport(report) { // TODO: Add proper check
-    if (report) {
-      return true;
-    }
-  }
-
-  addRansomwareReportTab() { // TODO: Fetch mode from API endpoint
-    let ransomwareTab = {key: 'ransomware', title: 'Ransomware report'};
-
-    // let mode = "";
-    // this.authFetch('/api/mode')
-    //   .then(res => res.json())
-    //     .then(res => {
-    //       mode = res.mode
-    //     }
-    //   );
-
-    let mode = 'ransomware';
-    if (mode === 'ransomware') {
-      this.state.orderedSections.splice(0, 0, ransomwareTab);
-    }
-    else {
-      this.state.orderedSections.push(ransomwareTab);
-    }
-  }
-
   componentWillUnmount() {
     clearInterval(this.state.ztReportRefreshInterval);
   }
@@ -187,9 +160,32 @@ class ReportPageComponent extends AuthComponent {
     }
   }
 
+  addRansomwareTab() {
+    let ransomwareTab = {key: 'ransomware', title: 'Ransomware report'};
+    if(this.isRansomwareTabMissing(ransomwareTab)){
+      if (this.props.islandMode === 'ransomware') {
+        this.state.orderedSections.splice(0, 0, ransomwareTab);
+      }
+      else {
+        this.state.orderedSections.push(ransomwareTab);
+      }
+    }
+  }
+
+  isRansomwareTabMissing(ransomwareTab) {
+    return (
+      this.props.islandMode !== undefined &&
+      !this.state.orderedSections.some(tab =>
+      (tab.key === ransomwareTab.key
+      && tab.title === ransomwareTab.title)
+    ));
+  }
+
   render() {
     let content;
 
+    this.addRansomwareTab();
+
     if (this.state.runStarted) {
       content = this.getReportContent();
     } else {