diff --git a/scm-ui/ui-components/.storybook/config.js b/scm-ui/ui-components/.storybook/config.js
index bfaea0245c..ae409e6478 100644
--- a/scm-ui/ui-components/.storybook/config.js
+++ b/scm-ui/ui-components/.storybook/config.js
@@ -70,7 +70,4 @@ addDecorator(
   })
 );
 
-const RoutingDecorator = (story) => <MemoryRouter initialEntries={["/"]}>{story()}</MemoryRouter>;
-addDecorator(RoutingDecorator);
-
 configure(require.context("../src", true, /\.stories\.tsx?$/), module);
diff --git a/scm-ui/ui-components/src/MarkdownView.stories.tsx b/scm-ui/ui-components/src/MarkdownView.stories.tsx
index 464efe42cc..6b49d10555 100644
--- a/scm-ui/ui-components/src/MarkdownView.stories.tsx
+++ b/scm-ui/ui-components/src/MarkdownView.stories.tsx
@@ -32,12 +32,14 @@ import MarkdownXmlCodeBlock from "./__resources__/markdown-xml-codeblock.md";
 import MarkdownInlineXml from "./__resources__/markdown-inline-xml.md";
 import Title from "./layout/Title";
 import { Subtitle } from "./layout";
+import {MemoryRouter} from "react-router-dom";
 
 const Spacing = styled.div`
   padding: 2em;
 `;
 
 storiesOf("MarkdownView", module)
+  .addDecorator(story => <MemoryRouter initialEntries={["/"]}>{story()}</MemoryRouter>)
   .addDecorator(story => <Spacing>{story()}</Spacing>)
   .add("Default", () => <MarkdownView content={TestPage} skipHtml={false} />)
   .add("Code without Lang", () => <MarkdownView content={MarkdownWithoutLang} skipHtml={false} />)
diff --git a/scm-ui/ui-components/src/buttons/index.stories.tsx b/scm-ui/ui-components/src/buttons/index.stories.tsx
index 9179cbb8a0..a0588b2dd4 100644
--- a/scm-ui/ui-components/src/buttons/index.stories.tsx
+++ b/scm-ui/ui-components/src/buttons/index.stories.tsx
@@ -32,6 +32,7 @@ import DownloadButton from "./DownloadButton";
 import EditButton from "./EditButton";
 import SubmitButton from "./SubmitButton";
 import { ReactElement } from "react";
+import { MemoryRouter } from "react-router-dom";
 
 const colors = ["primary", "link", "info", "success", "warning", "danger", "white", "light", "dark", "black", "text"];
 
@@ -42,6 +43,7 @@ const Spacing = styled.div`
 const SpacingDecorator = (story: () => ReactNode) => <Spacing>{story()}</Spacing>;
 
 storiesOf("Buttons|Button", module)
+  .addDecorator(story => <MemoryRouter initialEntries={["/"]}>{story()}</MemoryRouter>)
   .add("Colors", () => (
     <div>
       {colors.map(color => (
diff --git a/scm-ui/ui-components/src/layout/Footer.stories.tsx b/scm-ui/ui-components/src/layout/Footer.stories.tsx
index 02738f68c0..cae668ed19 100644
--- a/scm-ui/ui-components/src/layout/Footer.stories.tsx
+++ b/scm-ui/ui-components/src/layout/Footer.stories.tsx
@@ -33,6 +33,7 @@ import hitchhiker from "../__resources__/hitchhiker.png";
 import marvin from "../__resources__/marvin.jpg";
 import NavLink from "../navigation/NavLink";
 import ExternalLink from "../navigation/ExternalLink";
+import {MemoryRouter} from "react-router-dom";
 
 const trillian: Me = {
   name: "trillian",
@@ -64,6 +65,7 @@ const withBinder = (binder: Binder) => {
 };
 
 storiesOf("Layout|Footer", module)
+  .addDecorator(story => <MemoryRouter initialEntries={["/"]}>{story()}</MemoryRouter>)
   .add("Default", () => {
     return <Footer me={trillian} version="2.0.0" links={{}} />;
   })
diff --git a/scm-ui/ui-components/src/repos/RepositoryEntry.stories.tsx b/scm-ui/ui-components/src/repos/RepositoryEntry.stories.tsx
index 22979c631b..250c4b18c7 100644
--- a/scm-ui/ui-components/src/repos/RepositoryEntry.stories.tsx
+++ b/scm-ui/ui-components/src/repos/RepositoryEntry.stories.tsx
@@ -32,6 +32,7 @@ import { Binder, BinderContext } from "@scm-manager/ui-extensions";
 import { Repository } from "@scm-manager/ui-types";
 import Image from "../Image";
 import Icon from "../Icon";
+import {MemoryRouter} from "react-router-dom";
 
 const baseDate = "2020-03-26T12:13:42+02:00";
 
@@ -74,6 +75,7 @@ const QuickLink = (
 );
 
 storiesOf("RepositoryEntry", module)
+  .addDecorator(story => <MemoryRouter initialEntries={["/"]}>{story()}</MemoryRouter>)
   .addDecorator(storyFn => <Container>{storyFn()}</Container>)
   .add("Default", () => {
     return <RepositoryEntry repository={repository} baseDate={baseDate} />;