diff --git a/src/components/modals/main/marketplace/sections/Marketplace.jsx b/src/components/modals/main/marketplace/sections/Marketplace.jsx
index cccf3762..00a2f06d 100644
--- a/src/components/modals/main/marketplace/sections/Marketplace.jsx
+++ b/src/components/modals/main/marketplace/sections/Marketplace.jsx
@@ -289,7 +289,9 @@ class Marketplace extends PureComponent {
       );
     }
 
-    if (this.state.items?.length === 0) {
+    // TODO: Fix marketplace not loading on react 18, this is a temporary fix but ungraceful
+    // this.getItems();
+    if (!this.state.items || this.state.items?.length === 0) {
       return (
         <>
           {errorMessage(
diff --git a/src/index.jsx b/src/index.jsx
index 2385e0fd..eb7671ec 100644
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -1,4 +1,5 @@
-import { createRoot } from 'react-dom/client';
+import { render } from 'react-dom';
+
 import * as Sentry from '@sentry/react';
 
 import App from './App';
@@ -25,5 +26,9 @@ Sentry.init({
 });
 
 const container = document.getElementById('root');
-const root = createRoot(container);
-root.render(<App />);
+render(<App />, container);
+
+// TODO: Fix marketplace not loading on react 18 before upgrading
+// import { createRoot } from 'react-dom/client';
+// const root = createRoot(container);
+// root.render(<App />);