diff --git a/app/controllers/admin/page_parts_controller.rb b/app/controllers/admin/page_parts_controller.rb
index f3b37c1e0..867d251b1 100644
--- a/app/controllers/admin/page_parts_controller.rb
+++ b/app/controllers/admin/page_parts_controller.rb
@@ -65,11 +65,11 @@ class Admin::PagePartsController < OrbitBackendController
       params[:page_part][:module_app] = nil
     end
 
-    if params[:page_part][:tag] && params[:page_part][:tag].include?("nil")
+    if params[:page_part][:tag].nil? ||  params[:page_part][:tag].include?("nil")
       params[:page_part][:tag] = []
     end
 
-    if params[:page_part][:category] && params[:page_part][:category].include?("nil")
+    if params[:page_part][:category].nil? ||  params[:page_part][:category].include?("nil")
       params[:page_part][:category] = []
     end
 
diff --git a/app/controllers/admin/pages_controller.rb b/app/controllers/admin/pages_controller.rb
index 2d5af3473..2be56ad58 100644
--- a/app/controllers/admin/pages_controller.rb
+++ b/app/controllers/admin/pages_controller.rb
@@ -81,11 +81,11 @@ helper Admin::PagePartsHelper
     params[:page][:frontend_field_type] = nil
     params[:page][:frontend_field_is_link] = nil
 
-    if params[:page][:tag] && params[:page][:tag].include?("nil")
+    if params[:page][:tag].nil? || params[:page][:tag].include?("nil")
       params[:page][:tag] = []
     end
 
-    if params[:page][:category] && params[:page][:category].include?("nil")
+    if params[:page][:category].nil? || params[:page][:category].include?("nil")
       params[:page][:category] = []
     end