diff --git a/core/modules/content_moderation/src/ViewsData.php b/core/modules/content_moderation/src/ViewsData.php
index b357abc..dbef193 100644
--- a/core/modules/content_moderation/src/ViewsData.php
+++ b/core/modules/content_moderation/src/ViewsData.php
@@ -193,15 +193,11 @@ public function getViewsData() {
           'base' => $content_moderation_state_entity_base_table,
           'base field' => 'content_entity_id',
           'relationship field' => $entity_type->getKey('id'),
-          'join_extra' => [
+          'extra' => [
             [
               'field' => 'content_entity_type_id',
               'value' => $entity_type_id,
             ],
-            [
-              'field' => 'content_entity_revision_id',
-              'left_field' => $entity_type->getKey('revision'),
-            ],
           ],
         ],
         'field' => ['default_formatter' => 'content_moderation_state'],
@@ -216,7 +212,7 @@ public function getViewsData() {
           'base' => $content_moderation_state_entity_revision_base_table,
           'base field' => 'content_entity_revision_id',
           'relationship field' => $entity_type->getKey('revision'),
-          'join_extra' => [
+          'extra' => [
             [
               'field' => 'content_entity_type_id',
               'value' => $entity_type_id,
diff --git a/core/modules/content_moderation/tests/src/Kernel/ViewsDataIntegrationTest.php b/core/modules/content_moderation/tests/src/Kernel/ViewsDataIntegrationTest.php
index 6b127c8..f1cc5df 100644
--- a/core/modules/content_moderation/tests/src/Kernel/ViewsDataIntegrationTest.php
+++ b/core/modules/content_moderation/tests/src/Kernel/ViewsDataIntegrationTest.php
@@ -2,6 +2,8 @@
 
 namespace Drupal\Tests\content_moderation\Kernel;
 
+use Drupal\entity_test\Entity\EntityTestMul;
+use Drupal\entity_test\Entity\EntityTestMulRevPub;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
 use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
@@ -23,6 +25,7 @@ class ViewsDataIntegrationTest extends ViewsKernelTestBase {
     'node',
     'content_moderation',
     'workflows',
+    'entity_test',
   ];
 
   /**
@@ -32,6 +35,7 @@ protected function setUp($import_test_views = TRUE) {
     parent::setUp($import_test_views);
 
     $this->installEntitySchema('node');
+    $this->installEntitySchema('entity_test_mulrevpub');
     $this->installEntitySchema('user');
     $this->installEntitySchema('content_moderation_state');
     $this->installSchema('node', 'node_access');
@@ -44,7 +48,13 @@ protected function setUp($import_test_views = TRUE) {
     $node_type->save();
     $workflow = Workflow::load('editorial');
     $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'page');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('entity_test_mulrevpub', 'entity_test_mulrevpub');
     $workflow->save();
+
+    // Create a totally unrelated entity to ensure the extra join information
+    // joins by the correct entity type.
+    $entity = EntityTestMulRevPub::create([]);
+    $entity->save();
   }
 
   /**