diff --git a/src/components/common/EllipsisText/EllipsisText.tsx b/src/components/common/EllipsisText/EllipsisText.tsx
index fdcc56841de59275768d2d1e37bac1513441debc..3db3d23266f8d60db9383cae56024b2d4f3db9d6 100644
--- a/src/components/common/EllipsisText/EllipsisText.tsx
+++ b/src/components/common/EllipsisText/EllipsisText.tsx
@@ -4,42 +4,35 @@ import {
   TypographyProps,
   TooltipProps
 } from "@mui/material";
+import { EmptyValue } from "../EmptyValue";
 
 export interface EllipsisTextProps {
-  title?: string;
-  disableTooltip?: boolean;
   TypographyProps?: TypographyProps;
   TooltipProps?: TooltipProps;
-  children: string;
+  children?: string;
 }
 
 export const EllipsisText = ({
-  title,
-  disableTooltip = false,
   TypographyProps,
   TooltipProps,
   children
 }: EllipsisTextProps) => {
-  const renderedText = (
-    <Typography
-      noWrap
-      {...TypographyProps}
-    >
-      {children}
-    </Typography>
-  );
-
-  if (disableTooltip) {
-    return renderedText;
-  }
-
   return (
     <Tooltip
-      title={title ?? children}
+      title={children}
       arrow
       {...TooltipProps}
     >
-      {renderedText}
+      {children ? (
+        <Typography
+          noWrap
+          {...TypographyProps}
+        >
+          {children}
+        </Typography>
+      ) : (
+        <EmptyValue />
+      )}
     </Tooltip>
   );
 };
diff --git a/src/stories/common/EllipsisText/EllipsisText.stories.tsx b/src/stories/common/EllipsisText/EllipsisText.stories.tsx
index 189ed9a037fb15f7bf2587ce7a33bd1238a75e2f..b2cf212ef6d5a1d99363ce472042d262f819c8da 100644
--- a/src/stories/common/EllipsisText/EllipsisText.stories.tsx
+++ b/src/stories/common/EllipsisText/EllipsisText.stories.tsx
@@ -52,7 +52,6 @@ Default.args = {
   TypographyProps: {
     variant: "body2"
   },
-  disableTooltip: false,
   TooltipProps: {
     placement: "right-end"
   }
@@ -60,14 +59,16 @@ Default.args = {
 
 const ExternalLinkTemplate = ({ children, ...props }: EllipsisTextProps) => {
   return (
-    <Container>
-      <ExternalLink
-        to="https://europeanspallationsource.se/"
-        label={children}
-      >
-        <EllipsisText {...props}>{children}</EllipsisText>
-      </ExternalLink>
-    </Container>
+    <MemoryRouter>
+      <Container>
+        <ExternalLink
+          to="https://europeanspallationsource.se/"
+          label={children}
+        >
+          <EllipsisText {...props}>{children}</EllipsisText>
+        </ExternalLink>
+      </Container>
+    </MemoryRouter>
   );
 };
 
diff --git a/src/stories/fields/Autocomplete.stories.tsx b/src/stories/fields/Autocomplete.stories.tsx
index 015a650726707c446c196b1d3d9eacd44c6c043c..7db56ce528296d3240189c97e11ae469727255f9 100644
--- a/src/stories/fields/Autocomplete.stories.tsx
+++ b/src/stories/fields/Autocomplete.stories.tsx
@@ -57,16 +57,6 @@ const Template = ({ loading, ...args }: AutocompleteProps) => {
   );
 };
 
-export const Default = (args: typeof Autocomplete) => (
-  <Template
-    loading={false}
-    {...args}
-  />
-);
+export const Default = () => <Template loading={false} />;
 
-export const Loading = (args: typeof Autocomplete) => (
-  <Template
-    loading
-    {...args}
-  />
-);
+export const Loading = () => <Template loading />;