diff --git a/static/js/app.js b/static/js/app.js
index 35577621e..1c4554e7a 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -4896,7 +4896,7 @@ quayApp.directive('tagSpecificImagesView', function () {
         }
  
         var currentTag = $scope.repository.tags[$scope.tag];
-        if (image.dbid == currentTag.image.dbid) {
+        if (image.dbid == currentTag.dbid) {
           classes += 'tag-image ';
         }
         
@@ -4906,8 +4906,6 @@ quayApp.directive('tagSpecificImagesView', function () {
       var forAllTagImages = function(tag, callback) {
         if (!tag) { return; }
 
-        callback(tag.image);
-
         if (!$scope.imageByDBID) {
           $scope.imageByDBID = [];
           for (var i = 0; i < $scope.images.length; ++i) {
@@ -4916,7 +4914,14 @@ quayApp.directive('tagSpecificImagesView', function () {
           }
         }
 
-        var ancestors = tag.image.ancestors.split('/');
+        var tag_image = $scope.imageByDBID[tag.dbid];
+        if (!tag_image) {
+          return;
+        }
+        
+        callback(tag_image);
+
+        var ancestors = tag_image.ancestors.split('/');
         for (var i = 0; i < ancestors.length; ++i) {
           var image = $scope.imageByDBID[ancestors[i]];
           if (image) {