diff --git a/jina/executors/__init__.py b/jina/executors/__init__.py
index b0c1bdec65345..40ed022008af3 100644
--- a/jina/executors/__init__.py
+++ b/jina/executors/__init__.py
@@ -112,7 +112,8 @@ def __init__(awesomeness = 5):
 
     """
     store_args_kwargs = False  #: set this to ``True`` to save ``args`` (in a list) and ``kwargs`` (in a map) in YAML config
-    exec_methods = ['encode', 'add', 'query', 'craft', 'segment', 'score', 'evaluate', 'predict', 'query_by_id', 'delete', 'update']
+    exec_methods = ['encode', 'add', 'query', 'craft', 'segment', 'score', 'evaluate', 'predict', 'query_by_id',
+                    'delete', 'update']
 
     def __init__(self, *args, **kwargs):
         if isinstance(args, tuple) and len(args) > 0:
@@ -257,7 +258,7 @@ def current_workspace(self) -> str:
         :return: if ``separated_workspace`` is set to ``False`` then ``metas.workspace`` is returned,
                 otherwise the ``metas.pea_workspace`` is returned
         """
-        work_dir = self.pea_workspace if self.separated_workspace else self.workspace  # type: str
+        work_dir = self.pea_workspace if self.separated_workspace and self.pea_id != -1 else self.workspace  # type: str
         return work_dir
 
     def get_file_from_workspace(self, name: str) -> str:
diff --git a/jina/jaml/parsers/executor/legacy.py b/jina/jaml/parsers/executor/legacy.py
index e85982934fae6..4087490d395d8 100644
--- a/jina/jaml/parsers/executor/legacy.py
+++ b/jina/jaml/parsers/executor/legacy.py
@@ -12,7 +12,7 @@ class LegacyParser(VersionedYAMLParser):
     @staticmethod
     def _get_dump_path_from_config(meta_config: Dict):
         if 'name' in meta_config:
-            if meta_config.get('separated_workspace', False) is True:
+            if meta_config.get('separated_workspace', False) is True and meta_config['pea_id'] != -1:
                 if 'pea_id' in meta_config and isinstance(meta_config['pea_id'], int):
                     work_dir = meta_config['pea_workspace']
                     dump_path = os.path.join(work_dir, f'{meta_config["name"]}.{"bin"}')
diff --git a/tests/integration/incremental_indexing/test_unique_indexing.py b/tests/integration/incremental_indexing/test_unique_indexing.py
index b12e6e0c2f19c..00eadd60d168f 100644
--- a/tests/integration/incremental_indexing/test_unique_indexing.py
+++ b/tests/integration/incremental_indexing/test_unique_indexing.py
@@ -30,13 +30,14 @@ def test_unique_indexing_vecindexers(random_workspace, restful):
         assert vector_indexer.size == num_uniq_docs
 
 
+@pytest.mark.parametrize('separated_workspace', [False, True])
 @pytest.mark.parametrize('restful', [False, True])
-def test_unique_indexing_docindexers(random_workspace, restful):
+def test_unique_indexing_docindexers(random_workspace, restful, separated_workspace):
     total_docs = 10
     duplicate_docs, num_uniq_docs = get_duplicate_docs(num_docs=total_docs)
 
     f = (Flow(restful=restful)
-         .add(uses=os.path.join(cur_dir, 'uniq_docindexer.yml'), shards=1))
+         .add(uses=os.path.join(cur_dir, 'uniq_docindexer.yml'), shards=1, separated_workspace=separated_workspace))
 
     with f:
         f.index(duplicate_docs)
diff --git a/tests/unit/test_index.py b/tests/unit/test_index.py
index c8be7145044b4..90f0f4b801022 100644
--- a/tests/unit/test_index.py
+++ b/tests/unit/test_index.py
@@ -157,9 +157,7 @@ def test_index(test_workspace_index):
     f = Flow().add(uses=os.path.join(cur_dir, 'yaml/test-index.yml'), parallel=3, separated_workspace=True)
     with f:
         f.index(input_fn=random_docs(50))
-
     for j in range(3):
-        assert os.path.join(test_workspace_index, f'test2-{j + 1}/test2.bin')
         assert os.path.exists(os.path.join(test_workspace_index, f'test2-{j + 1}/tmp2'))