diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go
index 7aba1e94f348960faa6a58b7ab36d5d58fa7b1b4..acdbf18d8692d4b3a1e47c4d52e2110087155bb3 100644
--- a/cmd/ipfs/daemon.go
+++ b/cmd/ipfs/daemon.go
@@ -20,6 +20,8 @@ var Daemon = &cmds.Command{
 }
 
 func daemonFunc(req cmds.Request, res cmds.Response) {
+	// TODO: spin up a core.IpfsNode
+
 	ctx := req.Context()
 
 	lk, err := daemon.Lock(ctx.ConfigRoot)
@@ -41,7 +43,7 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
 		return
 	}
 
-	handler := cmdsHttp.Handler{}
+	handler := cmdsHttp.Handler{*ctx}
 	http.Handle(cmdsHttp.ApiPath+"/", handler)
 	err = http.ListenAndServe(host, nil)
 	if err != nil {