diff --git a/cmd/ipfs2/daemon.go b/cmd/ipfs2/daemon.go
index 1418030fb..c177fc71e 100644
--- a/cmd/ipfs2/daemon.go
+++ b/cmd/ipfs2/daemon.go
@@ -23,13 +23,6 @@ var daemonCmd = &cmds.Command{
 func daemonFunc(res cmds.Response, req cmds.Request) {
 	ctx := req.Context()
 
-	node, err := core.NewIpfsNode(ctx.Config, true)
-	if err != nil {
-		res.SetError(err, cmds.ErrNormal)
-		return
-	}
-	ctx.Node = node
-
 	lk, err := daemon.Lock(ctx.ConfigRoot)
 	if err != nil {
 		res.SetError(fmt.Errorf("Couldn't obtain lock. Is another daemon already running?"), cmds.ErrNormal)
@@ -37,6 +30,13 @@ func daemonFunc(res cmds.Response, req cmds.Request) {
 	}
 	defer lk.Close()
 
+	node, err := core.NewIpfsNode(ctx.Config, true)
+	if err != nil {
+		res.SetError(err, cmds.ErrNormal)
+		return
+	}
+	ctx.Node = node
+
 	addr, err := ma.NewMultiaddr(ctx.Config.Addresses.API)
 	if err != nil {
 		res.SetError(err, cmds.ErrNormal)