diff --git a/src/Access/LatestRevisionCheck.php b/src/Access/LatestRevisionCheck.php
index f8c46e6..389d6d4 100644
--- a/src/Access/LatestRevisionCheck.php
+++ b/src/Access/LatestRevisionCheck.php
@@ -7,6 +7,7 @@ use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Routing\Access\AccessInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Session\AccountInterface;
 use Drupal\workbench_moderation\ModerationInformationInterface;
 use Symfony\Component\Routing\Route;
 
@@ -18,13 +19,23 @@ class LatestRevisionCheck implements AccessInterface {
   protected $moderationInfo;
 
   /**
+   * The current active user.
+   *
+   * @return \Drupal\Core\Session\AccountInterface
+   */
+  protected $currentUser;
+
+  /**
    * Constructs a new LatestRevisionCheck.
    *
    * @param \Drupal\workbench_moderation\ModerationInformationInterface $moderation_information
    *   The moderation information service.
+   * @param \Drupal\Core\Session\AccountInterface
+   *   The current active user.
    */
-  public function __construct(ModerationInformationInterface $moderation_information) {
+  public function __construct(ModerationInformationInterface $moderation_information, AccountInterface $current_user) {
     $this->moderationInfo = $moderation_information;
+    $this->currentUser = $current_user;
   }
 
   /**
@@ -48,7 +59,14 @@ class LatestRevisionCheck implements AccessInterface {
     // This tab should not show up period unless there's a reason to show it.
     // @todo Do we need any extra cache tags here?
     $entity = $this->loadEntity($route, $route_match);
-    return $this->moderationInfo->hasForwardRevision($entity)
+
+    $forward_revision = NULL;
+
+    if ($this->moderationInfo->hasForwardRevision($entity)) {
+      $forward_revision = $this->moderationInfo->getLatestRevision($entity->getEntityTypeId(), $entity->id());
+    }
+
+    return $forward_revision
       ? AccessResult::allowed()->addCacheableDependency($entity)
       : AccessResult::forbidden()->addCacheableDependency($entity);
   }
diff --git a/workbench_moderation.services.yml b/workbench_moderation.services.yml
index 0edbe42..82c4500 100644
--- a/workbench_moderation.services.yml
+++ b/workbench_moderation.services.yml
@@ -25,6 +25,6 @@ services:
     arguments: ['@current_route_match']
   access_check.latest_revision:
     class: Drupal\workbench_moderation\Access\LatestRevisionCheck
-    arguments: ['@workbench_moderation.moderation_information']
+    arguments: ['@workbench_moderation.moderation_information', '@current_user']
     tags:
       - { name: access_check, applies_to: _workbench_moderation_latest_version }