diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index f4123ecb8a..22fcb6a24a 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -785,13 +785,6 @@ var (
 		Usage:    "Enable the XDCX protocol",
 		Category: flags.XdcxCategory,
 	}
-	XDCXDataDirFlag = &flags.DirectoryFlag{
-		Name:     "XDCx-datadir",
-		Aliases:  []string{"XDCx.datadir"},
-		Usage:    "Data directory for the XDCX databases",
-		Value:    flags.DirectoryString(filepath.Join(DataDirFlag.Value.String(), "XDCx")),
-		Category: flags.XdcxCategory,
-	}
 	XDCXDBEngineFlag = &cli.StringFlag{
 		Name:     "XDCx-dbengine",
 		Aliases:  []string{"XDCx.dbengine"},
@@ -1375,19 +1368,10 @@ func CheckExclusive(ctx *cli.Context, args ...interface{}) {
 
 func SetXDCXConfig(ctx *cli.Context, cfg *XDCx.Config, XDCDataDir string) {
 	if ctx.IsSet(XDCXDataDirFlag.Name) {
-		cfg.DataDir = ctx.String(XDCXDataDirFlag.Name)
-	} else {
-		// default XDCx datadir: DATADIR/XDCx
-		defaultXDCXDataDir := filepath.Join(XDCDataDir, "XDCx")
-
-		filesInXDCXDefaultDir, _ := WalkMatch(defaultXDCXDataDir, "*.ldb")
-		filesInNodeDefaultDir, _ := WalkMatch(node.DefaultDataDir(), "*.ldb")
-		if len(filesInXDCXDefaultDir) == 0 && len(filesInNodeDefaultDir) > 0 {
-			cfg.DataDir = node.DefaultDataDir()
-		} else {
-			cfg.DataDir = defaultXDCXDataDir
-		}
+		log.Warn("The flag XDCx-datadir or XDCx.datadir is deprecated, please remove this flag")
 	}
+	// XDCx datadir: XDCDataDir/XDCx
+	cfg.DataDir = filepath.Join(XDCDataDir, "XDCx")
 	log.Info("XDCX datadir", "path", cfg.DataDir)
 	if ctx.IsSet(XDCXDBEngineFlag.Name) {
 		cfg.DBEngine = ctx.String(XDCXDBEngineFlag.Name)
diff --git a/cmd/utils/flags_legacy.go b/cmd/utils/flags_legacy.go
index 6503542437..3660722dce 100644
--- a/cmd/utils/flags_legacy.go
+++ b/cmd/utils/flags_legacy.go
@@ -38,6 +38,7 @@ var DeprecatedFlags = []cli.Flag{
 	LogBacktraceAtFlag,
 	LogDebugFlag,
 	MiningEnabledFlag,
+	XDCXDataDirFlag,
 }
 
 var (
@@ -81,6 +82,12 @@ var (
 		Usage:    "Enable mining (deprecated)",
 		Category: flags.DeprecatedCategory,
 	}
+	XDCXDataDirFlag = &flags.DirectoryFlag{
+		Name:     "XDCx-datadir",
+		Aliases:  []string{"XDCx.datadir"},
+		Usage:    "Data directory for the XDCX databases (deprecated)",
+		Category: flags.DeprecatedCategory,
+	}
 )
 
 // showDeprecated displays deprecated flags that will be soon removed from the codebase.