diff --git a/orbit/changes/fix-shell b/orbit/changes/fix-shell
new file mode 100644
index 0000000000..b0a301fd6f
--- /dev/null
+++ b/orbit/changes/fix-shell
@@ -0,0 +1 @@
+* Fix `orbit shell` command to successfully run when Orbit is already running as daemon.
diff --git a/orbit/cmd/orbit/shell.go b/orbit/cmd/orbit/shell.go
index a5dadd7dda..5b3b868ffc 100644
--- a/orbit/cmd/orbit/shell.go
+++ b/orbit/cmd/orbit/shell.go
@@ -80,7 +80,7 @@ var shellCommand = &cli.Command{
 		r, _ := osquery.NewRunner(
 			osquerydPath,
 			osquery.WithShell(),
-			osquery.WithDataPath(c.String("root-dir")),
+			osquery.WithDataPath(filepath.Join(c.String("root-dir"), "shell")),
 			// Handle additional args after --
 			osquery.WithFlags(c.Args().Slice()),
 		)