diff --git a/src/buildstream/_stream.py b/src/buildstream/_stream.py
index 86ca04c63..159436914 100644
--- a/src/buildstream/_stream.py
+++ b/src/buildstream/_stream.py
@@ -308,7 +308,7 @@ def shell(
             element = self.targets[0]
             element._set_required(scope)
 
-            if scope == _Scope.BUILD:
+            if scope == _Scope.BUILD and not usebuildtree:
                 pull_elements = [element] + elements
             else:
                 pull_elements = elements