diff --git a/cafs/ipfs/config.go b/cafs/ipfs/config.go
index fe68b0e..fefd159 100644
--- a/cafs/ipfs/config.go
+++ b/cafs/ipfs/config.go
@@ -75,7 +75,7 @@ func OptsFromMap(opts map[string]interface{}) Option {
 	}
 }
 
-func (cfg *StoreCfg) InitRepo() error {
+func (cfg *StoreCfg) InitRepo(ctx context.Context) error {
 	if cfg.NilRepo {
 		return nil
 	}
@@ -88,8 +88,12 @@ func (cfg *StoreCfg) InitRepo() error {
 			if err == fsrepo.ErrNeedMigration {
 				return ErrIPFSRepoNeedsMigration
 			}
-			return fmt.Errorf("error opening local filestore ipfs repository: %s\n", err.Error())
+			return fmt.Errorf("error opening local filestore ipfs repository: %s", err.Error())
 		}
+		go func() {
+			<-ctx.Done()
+			localRepo.Close()
+		}()
 		cfg.Repo = localRepo
 	}
 	return nil
diff --git a/cafs/ipfs/filestore.go b/cafs/ipfs/filestore.go
index 53afa02..1e26679 100644
--- a/cafs/ipfs/filestore.go
+++ b/cafs/ipfs/filestore.go
@@ -6,8 +6,8 @@ import (
 	"io"
 
 	logging "github.com/ipfs/go-log"
-	cafs "github.com/qri-io/qfs/cafs"
 	"github.com/qri-io/qfs"
+	cafs "github.com/qri-io/qfs/cafs"
 
 	// Note coreunix is forked form github.com/ipfs/go-ipfs/core/coreunix
 	// we need coreunix.Adder.addFile to be exported to get access to dags while
@@ -54,7 +54,7 @@ func NewFilestore(config ...Option) (*Filestore, error) {
 		}, nil
 	}
 
-	if err := cfg.InitRepo(); err != nil {
+	if err := cfg.InitRepo(cfg.Ctx); err != nil {
 		return nil, err
 	}
 
@@ -78,10 +78,11 @@ func (fst *Filestore) Online() bool {
 	return fst.node.OnlineMode()
 }
 
-func (fst *Filestore) GoOnline() error {
+func (fst *Filestore) GoOnline(ctx context.Context) error {
+	log.Debug("going online")
 	cfg := fst.cfg
 	cfg.BuildCfg.Online = true
-	node, err := core.NewNode(cfg.Ctx, &cfg.BuildCfg)
+	node, err := core.NewNode(ctx, &cfg.BuildCfg)
 	if err != nil {
 		return fmt.Errorf("error creating ipfs node: %s\n", err.Error())
 	}