diff --git a/etcd/etcd.go b/etcd/etcd.go
index 8c94ac89f..c4c5db783 100644
--- a/etcd/etcd.go
+++ b/etcd/etcd.go
@@ -33,7 +33,6 @@ import (
 	ehttp "github.com/coreos/etcd/http"
 	"github.com/coreos/etcd/log"
 	"github.com/coreos/etcd/metrics"
-	"github.com/coreos/etcd/pkg/fs"
 	"github.com/coreos/etcd/server"
 	"github.com/coreos/etcd/store"
 )
@@ -103,11 +102,6 @@ func (e *Etcd) Run() {
 		log.Warnf("All cached configuration is now ignored. The file %s can be removed.", info)
 	}
 
-	// Set NOCOW for data directory in btrfs
-	if fs.IsBtrfs(e.Config.DataDir) {
-		fs.SetNOCOW(e.Config.DataDir)
-	}
-
 	var mbName string
 	if e.Config.Trace() {
 		mbName = e.Config.MetricsBucketName()
diff --git a/server/peer_server.go b/server/peer_server.go
index e7acdc000..9b93ae290 100644
--- a/server/peer_server.go
+++ b/server/peer_server.go
@@ -19,6 +19,7 @@ import (
 	etcdErr "github.com/coreos/etcd/error"
 	"github.com/coreos/etcd/log"
 	"github.com/coreos/etcd/metrics"
+	"github.com/coreos/etcd/pkg/fs"
 	"github.com/coreos/etcd/store"
 )
 
@@ -291,6 +292,11 @@ func (s *PeerServer) Start(snapshot bool, discoverURL string, peers []string) er
 
 	s.raftServer.Init()
 
+	// Set NOCOW for data directory in btrfs
+	if fs.IsBtrfs(s.raftServer.LogPath()) {
+		fs.SetNOCOW(s.raftServer.LogPath())
+	}
+
 	s.findCluster(discoverURL, peers)
 
 	s.closeChan = make(chan bool)