diff --git a/cmd/gossamer/config.go b/cmd/gossamer/config.go
index 14ae28f9cf..eaeb049e6a 100644
--- a/cmd/gossamer/config.go
+++ b/cmd/gossamer/config.go
@@ -736,6 +736,28 @@ func setDotRPCConfig(ctx *cli.Context, tomlCfg ctoml.RPCConfig, cfg *dot.RPCConf
 		cfg.External = false
 	}
 
+	// check --rpc-unsafe flag value
+	if rpcUnsafe := ctx.GlobalBool(RPCUnsafeEnabledFlag.Name); rpcUnsafe {
+		cfg.Unsafe = true
+	}
+
+	// check --rpc-unsafe-external flag value
+	if externalUnsafe := ctx.GlobalBool(RPCUnsafeExternalFlag.Name); externalUnsafe {
+		cfg.Unsafe = true
+		cfg.UnsafeExternal = true
+	}
+
+	// check --ws-unsafe flag value
+	if wsUnsafe := ctx.GlobalBool(WSUnsafeEnabledFlag.Name); wsUnsafe {
+		cfg.WSUnsafe = true
+	}
+
+	// check --ws-unsafe-external flag value
+	if wsExternalUnsafe := ctx.GlobalBool(WSUnsafeExternalFlag.Name); wsExternalUnsafe {
+		cfg.WSUnsafe = true
+		cfg.WSUnsafeExternal = true
+	}
+
 	// check --rpcport flag and update node configuration
 	if port := ctx.GlobalUint(RPCPortFlag.Name); port != 0 {
 		cfg.Port = uint32(port)
diff --git a/cmd/gossamer/export.go b/cmd/gossamer/export.go
index 4c845d7601..5f10cdc3b5 100644
--- a/cmd/gossamer/export.go
+++ b/cmd/gossamer/export.go
@@ -115,14 +115,18 @@ func dotConfigToToml(dcfg *dot.Config) *ctoml.Config {
 	}
 
 	cfg.RPC = ctoml.RPCConfig{
-		Enabled:    dcfg.RPC.Enabled,
-		External:   dcfg.RPC.External,
-		Port:       dcfg.RPC.Port,
-		Host:       dcfg.RPC.Host,
-		Modules:    dcfg.RPC.Modules,
-		WSPort:     dcfg.RPC.WSPort,
-		WS:         dcfg.RPC.WS,
-		WSExternal: dcfg.RPC.WSExternal,
+		Enabled:          dcfg.RPC.Enabled,
+		External:         dcfg.RPC.External,
+		Unsafe:           dcfg.RPC.Unsafe,
+		UnsafeExternal:   dcfg.RPC.UnsafeExternal,
+		Port:             dcfg.RPC.Port,
+		Host:             dcfg.RPC.Host,
+		Modules:          dcfg.RPC.Modules,
+		WSPort:           dcfg.RPC.WSPort,
+		WS:               dcfg.RPC.WS,
+		WSExternal:       dcfg.RPC.WSExternal,
+		WSUnsafe:         dcfg.RPC.WSUnsafe,
+		WSUnsafeExternal: dcfg.RPC.WSUnsafeExternal,
 	}
 
 	return cfg
diff --git a/cmd/gossamer/flags.go b/cmd/gossamer/flags.go
index 6222bcd224..f69518b4d8 100644
--- a/cmd/gossamer/flags.go
+++ b/cmd/gossamer/flags.go
@@ -287,7 +287,7 @@ var (
 		Usage: "Enable external websocket connections",
 	}
 	// WSFlag Enable the websockets server
-	WSUnsafeFlag = cli.BoolFlag{
+	WSUnsafeEnabledFlag = cli.BoolFlag{
 		Name:  "ws-unsafe",
 		Usage: "Enable access to websocket unsafe calls",
 	}
@@ -436,7 +436,7 @@ var (
 		RPCModulesFlag,
 		WSFlag,
 		WSExternalFlag,
-		WSUnsafeFlag,
+		WSUnsafeEnabledFlag,
 		WSUnsafeExternalFlag,
 		WSPortFlag,