diff --git a/src/components/notifications/Message.js b/src/components/notifications/Message.js
index 6e059ea30..e7ba6294b 100644
--- a/src/components/notifications/Message.js
+++ b/src/components/notifications/Message.js
@@ -37,10 +37,12 @@ import RatingWidget from "components/apps/RatingWidget";
 function MessageLink(props) {
     const { message, href, as } = props;
 
-    return (
+    return href ? (
         <Link href={href} as={as} passHref>
             <DELink text={message} />
         </Link>
+    ) : (
+        message
     );
 }
 
@@ -141,7 +143,7 @@ function DataLink(props) {
     const href =
         path && getFolderPage(rootFolderAction ? path : getParentPath(path));
 
-    return href ? <MessageLink href={href} message={message} /> : message;
+    return <MessageLink href={href} message={message} />;
 }
 
 function TeamLink(props) {