diff --git a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
index 3e00a401d4..5945e0e126 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
@@ -483,6 +483,8 @@ export function ContractDropdownUI(props: ContractDropdownProps) {
                 setSolcVersion={props.setCompilerVersion}
                 getVersion={props.getCompilerVersion}
                 evmCheckComplete={props.evmCheckComplete}
+                plugin={props.plugin}
+                runTabState={props.runTabState}
               />
               <div className="d-flex py-1 align-items-center custom-control custom-checkbox">
                 <input
diff --git a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
index 09219fb465..8e2e0330a9 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
@@ -175,7 +175,7 @@ export function ContractGUI(props: ContractGUIProps) {
   const handleActionClick = async () => {
     props.getVersion()
     await props.getCompilerDetails()
-    if (props.evmCheckComplete === false) return
+    if (props.evmCheckComplete === false && !props.runTabState.selectExEnv.toLowerCase().includes('vm-')) return
     if (deployState.deploy) {
       const proxyInitializeString = getMultiValsString(initializeFields.current)
       props.clickCallBack(props.initializerOptions.inputs.inputs, proxyInitializeString, ['Deploy with Proxy'])
diff --git a/libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx b/libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx
index f1ef7ae6b8..f562330ce6 100644
--- a/libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx
@@ -63,6 +63,7 @@ export function InstanceContainerUI(props: InstanceContainerProps) {
                 solcVersion={props.solcVersion}
                 getVersion={props.getVersion}
                 getCompilerDetails={props.getCompilerDetails}
+                runTabState={props.runTabState}
               />
             )
           })}
diff --git a/libs/remix-ui/run-tab/src/lib/components/settingsUI.tsx b/libs/remix-ui/run-tab/src/lib/components/settingsUI.tsx
index f7894042bd..12a7da58dd 100644
--- a/libs/remix-ui/run-tab/src/lib/components/settingsUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/settingsUI.tsx
@@ -10,11 +10,6 @@ import { ValueUI } from './value'
 export function SettingsUI(props: SettingsProps) {
   //   this._deps.config.events.on('settings/personal-mode_changed', this.onPersonalChange.bind(this))
 
-  useEffect(() => {
-    // listen for chainId change on window.ethereum and call EvaluateEnvironmentSelection
-    // (window as any).ethereum?.on('chainChanged', console.log('metamask did something')) //props.EvaluateEnvironmentSelection)
-  }, [])
-
   return (
     <div className="udapp_settings">
       <EnvironmentUI runTabPlugin={props.runTabPlugin} selectedEnv={props.selectExEnv} providers={props.providers} setExecutionContext={props.setExecutionContext} checkSelectionCorrectness={props.EvaluateEnvironmentSelection} />
diff --git a/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx b/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
index 321e4e29ae..18ed81d463 100644
--- a/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
@@ -328,6 +328,8 @@ export function UniversalDappUI(props: UdappProps) {
                     getVersion={props.getVersion}
                     getCompilerDetails={props.getCompilerDetails}
                     evmCheckComplete={false}
+                    plugin={props.plugin}
+                    runTabState={props.runTabState}
                     funcABI={funcABI}
                     clickCallBack={(valArray: {name: string; type: string}[], inputsValues: string) => {
                       runTransaction(lookupOnly, funcABI, valArray, inputsValues, index)
diff --git a/libs/remix-ui/run-tab/src/lib/run-tab.tsx b/libs/remix-ui/run-tab/src/lib/run-tab.tsx
index 5d1d1ef9c3..f8bf41c447 100644
--- a/libs/remix-ui/run-tab/src/lib/run-tab.tsx
+++ b/libs/remix-ui/run-tab/src/lib/run-tab.tsx
@@ -397,6 +397,8 @@ export function RunTabUI(props: RunTabProps) {
             getCompilerVersion={getVersion}
             getCompilerDetails={getCompilerDetails}
             evmCheckComplete={evmCheckComplete}
+            plugin={plugin}
+            runTabState={runTab}
           />
           <RecorderUI
             plugin={plugin}
@@ -412,6 +414,7 @@ export function RunTabUI(props: RunTabProps) {
           <InstanceContainerUI
             plugin={plugin}
             getCompilerDetails={getCompilerDetails}
+            runTabState={runTab}
             instances={runTab.instances}
             clearInstances={removeInstances}
             unpinInstance={unpinPinnedInstance}
diff --git a/libs/remix-ui/run-tab/src/lib/types/index.ts b/libs/remix-ui/run-tab/src/lib/types/index.ts
index 7c17aebb60..2be96aed4a 100644
--- a/libs/remix-ui/run-tab/src/lib/types/index.ts
+++ b/libs/remix-ui/run-tab/src/lib/types/index.ts
@@ -234,6 +234,8 @@ export type MainnetPrompt = (
 export interface ContractDropdownProps {
   getCompilerDetails: () => Promise<any>
   evmCheckComplete: boolean,
+  plugin: RunTab,
+  runTabState: RunTabState
   selectedAccount: string,
   exEnvironment: string,
   contracts: {
@@ -299,6 +301,7 @@ export interface RecorderProps {
 
 export interface InstanceContainerProps {
   getCompilerDetails: () => Promise<any>
+  runTabState: RunTabState
   instances: {
     instanceList: {
       contractData?: ContractData,
@@ -382,6 +385,8 @@ export interface DeployOptions {
 export interface ContractGUIProps {
   getCompilerDetails: () => Promise<any>
   evmCheckComplete: boolean,
+  plugin: RunTab,
+  runTabState: RunTabState
   title?: string,
   funcABI: FuncABI,
   inputs: string,
@@ -422,6 +427,7 @@ export interface MainnetProps {
 
 export interface UdappProps {
   getCompilerDetails: () => Promise<any>
+  runTabState: RunTabState
   instance: {
     contractData?: ContractData,
     address: string,