diff --git a/gatsby-node.js b/gatsby-node.js
index bb9ed6192..cc88386ba 100644
--- a/gatsby-node.js
+++ b/gatsby-node.js
@@ -36,14 +36,13 @@ exports.onCreatePage = async ({ page, actions }) => {
   const handleClientSideOnlyAsset = page.path.match(/^\/asset/)
   const handleClientSideOnlyAccount = page.path.match(/^\/account/)
 
-  if (handleClientSideOnlyAsset || handleClientSideOnlyAccount) {
-    page.matchPath = handleClientSideOnlyAsset
-      ? '/asset/*'
-      : handleClientSideOnlyAsset
-      ? '/account/*'
-      : '/'
+  if (handleClientSideOnlyAsset) {
+    page.matchPath = '/asset/*'
     // Update the page.
     createPage(page)
+  } else if (handleClientSideOnlyAccount) {
+    page.matchPath = '/account/*'
+    createPage(page)
   }
 }
 
diff --git a/src/components/organisms/AssetActions/Compute/index.tsx b/src/components/organisms/AssetActions/Compute/index.tsx
index c2a47a7aa..d4c669650 100644
--- a/src/components/organisms/AssetActions/Compute/index.tsx
+++ b/src/components/organisms/AssetActions/Compute/index.tsx
@@ -39,7 +39,7 @@ import { AssetSelectionAsset } from '../../../molecules/FormFields/AssetSelectio
 import AlgorithmDatasetsListForCompute from '../../AssetContent/AlgorithmDatasetsListForCompute'
 import { getPreviousOrders, getPrice } from '../../../../utils/subgraph'
 import AssetActionHistoryTable from '../../AssetActionHistoryTable'
-import ComputeJobs from '../../../pages/History/ComputeJobs'
+import ComputeJobs from '../../../pages/Account/History/ComputeJobs'
 
 const SuccessAction = () => (
   <Button style="text" to="/account?defaultTab=ComputeJobs" size="small">