diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js
index 2210f972e3..2347737a20 100644
--- a/apps/remix-ide/src/app.js
+++ b/apps/remix-ide/src/app.js
@@ -362,6 +362,9 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
     settings
   ])
 
+  const queryParams = new QueryParams()
+  const params = queryParams.get()
+
   const onAcceptMatomo = () => {
     _paq.push(['forgetUserOptOut'])
     // @TODO remove next line when https://github.com/matomo-org/matomo/commit/9e10a150585522ca30ecdd275007a882a70c6df5 is used
@@ -369,12 +372,21 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
     settings.updateMatomoAnalyticsChoice(true)
     const el = document.getElementById('modal-dialog')
     el.parentElement.removeChild(el)
+    startWalkthroughService()
   }
   const onDeclineMatomo = () => {
     settings.updateMatomoAnalyticsChoice(false)
     _paq.push(['optUserOut'])
     const el = document.getElementById('modal-dialog')
     el.parentElement.removeChild(el)
+    startWalkthroughService()
+  }
+
+  const startWalkthroughService = () => {
+    const walkthroughService = new WalkthroughService(localStorage)
+    if (!params.code && !params.url && !params.minimizeterminal && !params.gist && !params.minimizesidepanel) {
+      walkthroughService.start()
+    }
   }
 
   // Ask to opt in to Matomo for remix, remix-alpha and remix-beta
@@ -470,9 +482,6 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
   await appManager.activatePlugin(['settings'])
   await appManager.activatePlugin(['hiddenPanel', 'pluginManager', 'filePanel', 'contextualListener', 'terminal', 'fetchAndCompile', 'contentImport'])
 
-  const queryParams = new QueryParams()
-  const params = queryParams.get()
-
   // Set workspace after initial activation
   if (Array.isArray(workspace)) {
     appManager.activatePlugin(workspace).then(async () => {
@@ -507,8 +516,5 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
   if (params.embed) framingService.embed()
   framingService.start(params)
 
-  const walkthroughService = new WalkthroughService(localStorage)
-  if (!params.code) {
-    walkthroughService.start()
-  }
+  startWalkthroughService()
 }
diff --git a/apps/remix-ide/src/app/tabs/analysis-tab.js b/apps/remix-ide/src/app/tabs/analysis-tab.js
index b3bba2705c..e9efe9f302 100644
--- a/apps/remix-ide/src/app/tabs/analysis-tab.js
+++ b/apps/remix-ide/src/app/tabs/analysis-tab.js
@@ -50,9 +50,7 @@ class AnalysisTab extends ViewPlugin {
   renderComponent () {
     ReactDOM.render(
       <RemixUiStaticAnalyser
-        analysisRunner={this.runner}
         registry={this.registry}
-        staticanalysis={this.staticanalysis}
         analysisModule={this}
         event={this.event}
       />,
diff --git a/libs/remix-ui/publish-to-storage/src/lib/publishToIPFS.tsx b/libs/remix-ui/publish-to-storage/src/lib/publishToIPFS.tsx
index 60fbb830b5..8b9a369565 100644
--- a/libs/remix-ui/publish-to-storage/src/lib/publishToIPFS.tsx
+++ b/libs/remix-ui/publish-to-storage/src/lib/publishToIPFS.tsx
@@ -1,7 +1,7 @@
 import IpfsClient from 'ipfs-mini'
 
 const ipfsNodes = [
-  new IpfsClient({ host: 'ipfs.komputing.org', port: 443, protocol: 'https' }),
+  new IpfsClient({ host: 'ipfs.remixproject.org', port: 443, protocol: 'https' }),
   new IpfsClient({ host: 'ipfs.infura.io', port: 5001, protocol: 'https' }),
   new IpfsClient({ host: '127.0.0.1', port: 5001, protocol: 'http' })
 ]
diff --git a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
index 3c33075271..4434db6c26 100644
--- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
@@ -65,7 +65,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
 
   useEffect(() => {
     compilation(props.analysisModule, dispatch)
-  }, [])
+  }, [props])
 
   useEffect(() => {
     setWarningState({})
@@ -91,7 +91,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
       if (currentWorkspace && currentWorkspace.isLocalhost === true) setShowSlither('visible')
     })
     return () => { }
-  }, [props.analysisModule])
+  }, [props])
 
   const message = (name, warning, more, fileName, locationString) : string => {
     return (`