diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 0222641bf..e7868e9a2 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,4 +1,5 @@
 7.8.8
+ - fixed #11289: Gallery with pending version tag causes search engine indexer to puke.
 
 7.8.7
  - fixed #11278: Wrong test for Template::Toolkit in testEnvironment.pl
diff --git a/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm b/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
index 79937eb06..abba5673b 100644
--- a/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
+++ b/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
@@ -311,8 +311,7 @@ sub canEdit {
     }
     else {
         return 1 if $userId eq $self->get("ownerUserId");
-            
-        return $gallery->canEdit($userId);
+        return $gallery && $gallery->canEdit($userId);
     }
 }
 
diff --git a/t/Asset/File/GalleryFile/Photo/permissions.t b/t/Asset/File/GalleryFile/Photo/permissions.t
index 70552ebc1..74774601a 100644
--- a/t/Asset/File/GalleryFile/Photo/permissions.t
+++ b/t/Asset/File/GalleryFile/Photo/permissions.t
@@ -27,10 +27,9 @@ my $node            = WebGUI::Asset->getImportNode($session);
 my $maker           = WebGUI::Test::Maker::Permission->new;
 
 $session->user({ userId => 3 });
-my @versionTags = ();
-push @versionTags, WebGUI::VersionTag->getWorking($session);
-$versionTags[-1]->set({name=>"Photo Test, add Gallery, Album and 1 Photo"});
-WebGUI::Test->tagsToRollback(@versionTags);
+my $versionTag = WebGUI::VersionTag->getWorking($session);
+$versionTag->set({name=>"Photo Test, add Gallery, Album and 1 Photo"});
+WebGUI::Test->tagsToRollback($versionTag);
 
 # Add a new user to the test user's friends list
 my $friend  = WebGUI::User->new($session, "new");
@@ -73,7 +72,18 @@ my $photo
     {
         skipAutoCommitWorkflows => 1,
     });
-$versionTags[-1]->commit;
+
+my $photo2 = $photo->cloneFromDb;
+my $album2 = $album->cloneFromDb;
+
+$session->stow->delete('assetRevision');
+$versionTag->leaveTag;
+
+$session->user({userId => $notFriend->userId});
+diag $album2->canEdit;
+$session->user({userId => 1});
+
+$versionTag->commit;
 
 #----------------------------------------------------------------------------
 # Tests