diff --git a/app/models/board.rb b/app/models/board.rb
index f12bb303..6a03ff39 100644
--- a/app/models/board.rb
+++ b/app/models/board.rb
@@ -10,7 +10,7 @@ class Board < ApplicationRecord
   validates :name, presence: true, uniqueness: { scope: :tenant_id }
   validates :description, length: { in: 0..1024 }, allow_nil: true
 
-  friendly_id :name, use: :slugged
+  friendly_id :name, use: :scoped, scope: :tenant_id
 
   def sanitize_slug
     self.slug = self.slug.parameterize
diff --git a/app/models/o_auth.rb b/app/models/o_auth.rb
index 3cdf5e0c..4b5c728d 100644
--- a/app/models/o_auth.rb
+++ b/app/models/o_auth.rb
@@ -19,7 +19,7 @@ class OAuth < ApplicationRecord
   validates :scope, presence: true
   validates :json_user_email_path, presence: true
 
-  friendly_id :generate_random_slug, use: :slugged
+  friendly_id :generate_random_slug, use: :scoped, scope: :tenant_id
 
   def is_default?
     tenant_id == nil
diff --git a/app/models/post.rb b/app/models/post.rb
index 8fa1e190..6de73fa1 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -16,7 +16,7 @@ class Post < ApplicationRecord
 
   paginates_per Rails.application.posts_per_page
 
-  friendly_id :title, use: :slugged
+  friendly_id :title, use: :scoped, scope: :tenant_id
 
   class << self
     def find_with_post_status_in(post_statuses)