diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb
index d8597afa..128b8850 100755
--- a/app/models/menu_category.rb
+++ b/app/models/menu_category.rb
@@ -7,7 +7,7 @@ class MenuCategory < ApplicationRecord
   has_many :menu_items
 
   validates_presence_of :code, :name, :menu, :order_by
-  validates_uniqueness_of :code
+  validate_uniqueness_of :code, scope: shop_code
 
   default_scope { order('order_by asc') }
   scope :active, -> {where("is_available = 1")}
diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb
index 5edf9513..8a1fb5b1 100755
--- a/app/models/menu_item.rb
+++ b/app/models/menu_item.rb
@@ -14,7 +14,7 @@ class MenuItem < ApplicationRecord
   has_and_belongs_to_many :item_sets, join_table: "menu_item_sets"
 
   validates_presence_of :item_code, :name, :type, :min_qty,:account_id
-  validates_uniqueness_of :item_code
+  validate_uniqueness_of :item_code, scope: shop_code
 
   default_scope { order('item_code asc') }