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 b6fab8602..01e19382e 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
@@ -1,6 +1,10 @@
 class Panel::Gallery::FrontEnd::AlbumsController < OrbitWidgetController
   def index
-    @albums = GalleryAlbum.where(:category_id.in => params[:category_id])
+    if params[:category_id].blank?
+      @albums = GalleryAlbum.where()
+    else
+      @albums = GalleryAlbum.where(:category_id.in => params[:category_id])
+    end
   end
 
   def show