diff --git a/packages/grafnode-run/src/pageComponents/Main/index.js b/packages/grafnode-run/src/pageComponents/Main/index.js
index 740ce0a0..3aeaac73 100644
--- a/packages/grafnode-run/src/pageComponents/Main/index.js
+++ b/packages/grafnode-run/src/pageComponents/Main/index.js
@@ -33,11 +33,6 @@ import 'codemirror/addon/hint/show-hint.css';
 const RequestTabPanel = dynamic(import('@grafnode/components').then(mod => mod.RequestTabPanel), { ssr: false });
 
 export default function Main() {
-  // disable ssr
-  if(typeof window === 'undefined') {
-    return null;
-  }
-
   const [state, dispatch] = useStore();
 
   const {
@@ -72,5 +67,6 @@ export default function Main() {
         </section>
       </StyledWrapper>
     </div>
-  )
-}
\ No newline at end of file
+  );
+};
+
diff --git a/packages/grafnode-run/src/pages/_app.js b/packages/grafnode-run/src/pages/_app.js
index 445558e4..30ee12fd 100644
--- a/packages/grafnode-run/src/pages/_app.js
+++ b/packages/grafnode-run/src/pages/_app.js
@@ -6,11 +6,21 @@ import 'react-tabs/style/react-tabs.css';
 import 'codemirror/lib/codemirror.css';
 import 'graphiql/graphiql.min.css';
 
+function SafeHydrate({ children }) {
+  return (
+    <div suppressHydrationWarning>
+      {typeof window === 'undefined' ? null : children}
+    </div>
+  )
+}
+
 function MyApp({ Component, pageProps }) {
   return (
-    <StoreProvider>
-      <Component {...pageProps} />
-    </StoreProvider>
+    <SafeHydrate>
+      <StoreProvider>
+        <Component {...pageProps} />
+      </StoreProvider>
+    </SafeHydrate>
   );
 }
 
diff --git a/packages/grafnode-run/src/styles/globals.css b/packages/grafnode-run/src/styles/globals.css
index 78178bcd..c0d97efb 100644
--- a/packages/grafnode-run/src/styles/globals.css
+++ b/packages/grafnode-run/src/styles/globals.css
@@ -2,7 +2,7 @@ html, body {
   margin: 0;
   padding: 0;
   font-size: 1rem;
-  color: rgb(62 62 62);
+  color: rgb(48 48 48);
 
   font-kerning: none;
   text-rendering: optimizeSpeed;