diff --git a/src/components/IOC/IOCLiveStatus.js b/src/components/IOC/IOCLiveStatus.js
index cbe54a2233df4f2f43c1dad2808df34f4a849746..c7d591f0ec982c0a8dc0ca07381bb5cb016238e6 100644
--- a/src/components/IOC/IOCLiveStatus.js
+++ b/src/components/IOC/IOCLiveStatus.js
@@ -1,8 +1,8 @@
 import React, { useCallback } from "react";
-import { Typography, makeStyles } from "@material-ui/core";
+import { Typography, makeStyles, Link as MuiLink } from "@material-ui/core";
 import { SimpleAccordion } from "../common/Accordion/SimpleAccordion";
 import { IOCDetails } from "./IOCDetails";
-import { Link } from 'react-router-dom';
+import { Link as ReactRouterLink } from 'react-router-dom';
 import { LokiContainer } from "../common/Loki/LokiContainer";
 import { RecordSearch } from "../records/RecordSearch";
 import GitRefLink from "./GitRefLink";
@@ -37,7 +37,7 @@ export function IOCLiveStatus({ ioc }) {
       "Deployed on": (iocHasDeployment && ioc.activeDeployment?.host.csEntryIdValid) ?
         <Typography>
           {ioc.activeDeployment?.host.csEntryId ?
-            <Link to={`/hosts/${ioc.activeDeployment?.host.csEntryId}`}>{ioc.activeDeployment?.host.fqdn}</Link>
+            <MuiLink component={ReactRouterLink} to={`/hosts/${ioc.activeDeployment?.host.csEntryId}`}>{ioc.activeDeployment?.host.fqdn}</MuiLink>
             :
             <>{ioc.activeDeployment?.host.fqdn}</>
           }
diff --git a/src/components/deployments/DeploymentBadge.js b/src/components/deployments/DeploymentBadge.js
index eb50253d39b1b047df4fe985b96a93441c7085e6..fdbcca8dec82c6793acc9483143986c364c0a3ad 100644
--- a/src/components/deployments/DeploymentBadge.js
+++ b/src/components/deployments/DeploymentBadge.js
@@ -1,11 +1,12 @@
 import React from "react";
 import { IconBadge } from "../common/Badge/IconBadge";
 import { DeploymentTypeIcon } from "./DeploymentIcons";
-import { Link } from 'react-router-dom';
+import { Link as MuiLink } from "@material-ui/core";
+import { Link as ReactRouterLink } from 'react-router-dom';
 
 export function DeploymentBadge({ deployment }) {
   
-  const linkToIoc = <Link to={`/iocs/${deployment.iocId}`}>{deployment.namingName}</Link>;
+  const linkToIoc = <MuiLink component={ReactRouterLink} to={`/iocs/${deployment.iocId}`}>{deployment.namingName}</MuiLink>;
   
   return (
     <IconBadge 
diff --git a/src/components/deployments/DeploymentDetails.js b/src/components/deployments/DeploymentDetails.js
index 940103c4e24ab47f33ff6fe67bb30c14b529fdf0..50e3ff8b752e02c0cdc428d674086dafb1e5f23a 100644
--- a/src/components/deployments/DeploymentDetails.js
+++ b/src/components/deployments/DeploymentDetails.js
@@ -6,7 +6,7 @@ import { SimpleAccordion } from "../common/Accordion/SimpleAccordion";
 import { DeploymentBadge } from './DeploymentBadge';
 import { DeploymentJobOutput } from './DeploymentJobOutput';
 import { Alert } from '@material-ui/lab';
-import { Link } from 'react-router-dom';
+import { Link as ReactRouterLink } from 'react-router-dom';
 import { formatDate } from '../common/Helper';
 import GitRefLink from '../IOC/GitRefLink';
 import AccessControl from '../auth/AccessControl';
@@ -49,7 +49,7 @@ export function DeploymentDetails({ deployment, deploymentJob }) {
     if (deployment.host.csEntryId && deployment.host.csEntryIdValid) {
       return (
       <Typography>
-          <Link to={`/hosts/${deployment.host.csEntryId}`}>{deployment.host.fqdn}</Link>
+          <MuiLink component={ReactRouterLink} to={`/hosts/${deployment.host.csEntryId}`}>{deployment.host.fqdn}</MuiLink>
       </Typography>)
     }
 
diff --git a/src/views/records/RecordDetailsView.js b/src/views/records/RecordDetailsView.js
index ecc5b73cd2a93c44ef10bc5e1f784d8affd2b405..f82e559d24941129251806b53099639cf7a751dd 100644
--- a/src/views/records/RecordDetailsView.js
+++ b/src/views/records/RecordDetailsView.js
@@ -4,9 +4,10 @@ import {
   Paper,
   IconButton,
   Typography,
-  LinearProgress
+  LinearProgress,
+  Link as MuiLink
 } from '@material-ui/core';
-import { Link } from 'react-router-dom';
+import { Link as ReactRouterLink } from 'react-router-dom';
 import { RootContainer } from "../../components/common/Container/RootContainer";
 import ArrowBackIcon from '@material-ui/icons/ArrowBack';
 import { useGlobalAppBar } from '../../components/navigation/GlobalAppBar/GlobalAppBar';
@@ -39,13 +40,13 @@ export function RecordDetailsView() {
     let subset = {
       "IOC": record.iocId ?
         <Typography>
-            <Link to={`/iocs/${record.iocId}`}>{record?.iocName}</Link>
+            <MuiLink component={ReactRouterLink} to={`/iocs/${record.iocId}`}>{record?.iocName}</MuiLink>
         </Typography> 
         : record?.iocName,
       "IOC version": record?.iocVersion,
       "Host": record.hostCSentryId ?
         <Typography>
-          <Link to={`/hosts/${record.hostCSentryId}`}>{record?.hostName}</Link>
+          <MuiLink component={ReactRouterLink} to={`/hosts/${record.hostCSentryId}`}>{record?.hostName}</MuiLink>
         </Typography> 
         : record?.hostName
     }