diff --git a/site/.storybook/preview.js b/site/.storybook/preview.js
index 9572bef122..eba3d0d74d 100644
--- a/site/.storybook/preview.js
+++ b/site/.storybook/preview.js
@@ -2,9 +2,23 @@ import ThemeProvider from "@material-ui/styles/ThemeProvider"
 import { withThemes } from "@react-theming/storybook-addon"
 import { light, dark } from "../theme"
 import { addDecorator } from "node_modules/@storybook/react"
+import { createMemoryHistory } from "history"
+import { unstable_HistoryRouter as HistoryRouter } from "react-router-dom"
 
 addDecorator(withThemes(ThemeProvider, [light, dark]))
 
+const history = createMemoryHistory()
+
+const routerDecorator = (Story) => {
+  return (
+    <HistoryRouter history={history}>
+      <Story />
+    </HistoryRouter>
+  )
+}
+
+addDecorator(routerDecorator)
+
 export const parameters = {
   actions: {
     argTypesRegex: "^on[A-Z].*",
diff --git a/site/components/Workspace/Workspace.stories.tsx b/site/components/Workspace/Workspace.stories.tsx
index 4e03c3b456..db3ab80384 100644
--- a/site/components/Workspace/Workspace.stories.tsx
+++ b/site/components/Workspace/Workspace.stories.tsx
@@ -1,7 +1,7 @@
 import { Story } from "@storybook/react"
 import React from "react"
 import { Workspace, WorkspaceProps } from "./Workspace"
-import { MockWorkspace } from "../../test_helpers"
+import { MockOrganization, MockProject, MockWorkspace } from "../../test_helpers"
 
 export default {
   title: "Workspace",
@@ -13,5 +13,7 @@ const Template: Story<WorkspaceProps> = (args) => <Workspace {...args} />
 
 export const Example = Template.bind({})
 Example.args = {
+  organization: MockOrganization,
+  project: MockProject,
   workspace: MockWorkspace,
 }