diff --git a/node/cmd/guardiand/adminnodes.go b/node/cmd/guardiand/adminnodes.go
index 4fbd0e299..5cdff0c0e 100644
--- a/node/cmd/guardiand/adminnodes.go
+++ b/node/cmd/guardiand/adminnodes.go
@@ -101,10 +101,10 @@ func runListNodes(cmd *cobra.Command, args []string) {
 		{"BSC", vaa.ChainIDBSC},
 		{"Polygon", vaa.ChainIDPolygon},
 		{"Avalanche", vaa.ChainIDAvalanche},
+		{"Oasis", vaa.ChainIDOasis},
 	}
 
 	if isTestnet {
-		networks = append(networks, network{"Oasis", vaa.ChainIDOasis})
 		networks = append(networks, network{"Ropsten", vaa.ChainIDEthereumRopsten})
 	}
 
diff --git a/node/cmd/guardiand/node.go b/node/cmd/guardiand/node.go
index 5c926306f..735217886 100644
--- a/node/cmd/guardiand/node.go
+++ b/node/cmd/guardiand/node.go
@@ -251,8 +251,8 @@ func runNode(cmd *cobra.Command, args []string) {
 	readiness.RegisterComponent(common.ReadinessBSCSyncing)
 	readiness.RegisterComponent(common.ReadinessPolygonSyncing)
 	readiness.RegisterComponent(common.ReadinessAvalancheSyncing)
+	readiness.RegisterComponent(common.ReadinessOasisSyncing)
 	if *testnetMode {
-		readiness.RegisterComponent(common.ReadinessOasisSyncing)
 		readiness.RegisterComponent(common.ReadinessEthRopstenSyncing)
 	}
 
@@ -342,13 +342,10 @@ func runNode(cmd *cobra.Command, args []string) {
 	if *avalancheRPC == "" {
 		logger.Fatal("Please specify --avalancheRPC")
 	}
+	if *oasisRPC == "" {
+		logger.Fatal("Please specify --oasisRPC")
+	}
 	if *testnetMode {
-		if *oasisRPC == "" {
-			logger.Fatal("Please specify --oasisRPC")
-		}
-		if *oasisContract == "" {
-			logger.Fatal("Please specify --oasisContract")
-		}
 		if *ethRopstenRPC == "" {
 			logger.Fatal("Please specify --ethRopstenRPC")
 		}
@@ -569,12 +566,12 @@ func runNode(cmd *cobra.Command, args []string) {
 			ethereum.NewEthWatcher(*avalancheRPC, avalancheContractAddr, "avalanche", common.ReadinessAvalancheSyncing, vaa.ChainIDAvalanche, lockC, nil).Run); err != nil {
 			return err
 		}
+		if err := supervisor.Run(ctx, "oasiswatch",
+			ethereum.NewEthWatcher(*oasisRPC, oasisContractAddr, "oasis", common.ReadinessOasisSyncing, vaa.ChainIDOasis, lockC, nil).Run); err != nil {
+			return err
+		}
 
 		if *testnetMode {
-			if err := supervisor.Run(ctx, "oasiswatch",
-				ethereum.NewEthWatcher(*oasisRPC, oasisContractAddr, "oasis", common.ReadinessOasisSyncing, vaa.ChainIDOasis, lockC, nil).Run); err != nil {
-				return err
-			}
 			if err := supervisor.Run(ctx, "ethropstenwatch",
 				ethereum.NewEthWatcher(*ethRopstenRPC, ethRopstenContractAddr, "ethropsten", common.ReadinessEthRopstenSyncing, vaa.ChainIDEthereumRopsten, lockC, setC).Run); err != nil {
 				return err