diff --git a/piker/data/cli.py b/piker/data/cli.py
index cb081c6e..6f4e169d 100644
--- a/piker/data/cli.py
+++ b/piker/data/cli.py
@@ -30,7 +30,7 @@ import tractor
 import click
 import numpy as np
 
-from .marketstore import (
+from ..service.marketstore import (
     get_client,
     # stream_quotes,
     ingest_quote_stream,
diff --git a/piker/data/feed.py b/piker/data/feed.py
index a31e955a..69d5be7d 100644
--- a/piker/data/feed.py
+++ b/piker/data/feed.py
@@ -86,7 +86,7 @@ from ..brokers._util import (
 )
 
 if TYPE_CHECKING:
-    from .marketstore import Storage
+    from ..service.marketstore import Storage
 
 log = get_logger(__name__)
 
@@ -865,7 +865,7 @@ async def manage_history(
         ):
             log.info('Found existing `marketstored`')
 
-            from . import marketstore
+            from ..service import marketstore
             async with (
                 marketstore.open_storage_client(fqsn)as storage,
             ):