diff --git a/core/modules/content_translation/src/Plugin/migrate/source/d6/BlockTranslation.php b/core/modules/content_translation/src/Plugin/migrate/source/d6/BlockTranslation.php
index f37d89191a..9da34d1242 100644
--- a/core/modules/content_translation/src/Plugin/migrate/source/d6/BlockTranslation.php
+++ b/core/modules/content_translation/src/Plugin/migrate/source/d6/BlockTranslation.php
@@ -18,12 +18,15 @@ class BlockTranslation extends Block {
    * {@inheritdoc}
    */
   public function query() {
-    $query = parent::query()
+    // Let the parent set the block table to use but do not use the parent query.
+    // Instead build a query so can use a left join to the selected block table.
+    parent::query();
+    $query = $this->select('i18n_blocks', 'i18n')
       ->fields('i18n', ['ibid', 'module', 'delta', 'type', 'language'])
-      ->fields('b', ['bid', 'theme', 'title']);
+      ->fields('b', ['bid', 'module', 'delta', 'theme', 'title']);
     $query->addField('b', 'module', 'block_module');
     $query->addField('b', 'delta', 'block_delta');
-    $query->innerJoin('i18n_blocks', 'i18n', ('b.module = i18n.module AND b.delta = i18n.delta'));
+    $query->leftJoin($this->blockTable, 'b', ('b.module = i18n.module AND b.delta = i18n.delta'));
     return $query;
   }