diff --git a/Gemfile b/Gemfile
index 998f1dee593..982e12a77a4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -50,8 +50,7 @@ gem 'warden-basic_auth', '~> 0.2.1'
 
 gem 'will_paginate', '~> 3.1.7'
 
-# Replace once friendly_id release supports rails 6
-gem 'friendly_id', git: 'https://github.com/norman/friendly_id', ref: '67422c04e1bfed4207b2a04826bc67ec0e231ce7'
+gem 'friendly_id', '~> 5.3.0'
 
 gem 'acts_as_list', '~> 0.9.9'
 gem 'acts_as_tree', '~> 2.9.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index c01d8cf8630..75a400f2757 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,14 +31,6 @@ GIT
       capybara
       rspec
 
-GIT
-  remote: https://github.com/norman/friendly_id
-  revision: 67422c04e1bfed4207b2a04826bc67ec0e231ce7
-  ref: 67422c04e1bfed4207b2a04826bc67ec0e231ce7
-  specs:
-    friendly_id (5.2.5)
-      activerecord (>= 4.0.0)
-
 GIT
   remote: https://github.com/opf/omniauth
   revision: fe862f986b2e846e291784d2caa3d90a658c67f0
@@ -516,6 +508,8 @@ GEM
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
     formatador (0.2.5)
+    friendly_id (5.3.0)
+      activerecord (>= 4.0.0)
     fuubar (2.3.2)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
@@ -996,7 +990,7 @@ DEPENDENCIES
   faker
   flamegraph
   fog-aws
-  friendly_id!
+  friendly_id (~> 5.3.0)
   fuubar (~> 2.3.2)
   gon (~> 6.2.1)
   grape (~> 1.3.0)