diff --git a/vendor/built_in_modules/gallery/app/controllers/panel/gallery/front_end/albums_controller.rb b/vendor/built_in_modules/gallery/app/controllers/panel/gallery/front_end/albums_controller.rb
index 01e19382e..4d1935674 100644
--- a/vendor/built_in_modules/gallery/app/controllers/panel/gallery/front_end/albums_controller.rb
+++ b/vendor/built_in_modules/gallery/app/controllers/panel/gallery/front_end/albums_controller.rb
@@ -46,7 +46,8 @@ class Panel::Gallery::FrontEnd::AlbumsController < OrbitWidgetController
     @album = GalleryAlbum.find(@albumid)
     @images = @album.gallery_images.all
     tags = @album.tag_ids
-    @tagnames = Tag.find(tags.tagged_ids).map{|t| t.name}
+    @tagnames = [] if tags.blank?
+    @tagnames = Tag.find(tags.tagged_ids).map{|t| t.name} if !tags.blank?
     @back_link = panel_gallery_front_end_album_path(@albumid)
   end
 end