diff --git a/Gemfile b/Gemfile
index aec824937..2fddbc025 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,7 @@ gem 'delayed_job_web'
 gem 'devise' # Gestion des comptes utilisateurs
 gem 'devise-async'
 gem 'devise-i18n'
-gem 'devise-two-factor', github: 'bryanfagan/devise-two-factor'
+gem 'devise-two-factor', github: 'jason-hobbs/devise-two-factor', branch: 'master' # Rails 6.1 compatibility: https://github.com/tinfoil/devise-two-factor/issues/183
 gem 'discard'
 gem 'dotenv-rails', require: 'dotenv/rails-now' # dotenv should always be loaded before rails
 gem 'ffi-geos', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 374f79742..09a201545 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,13 +1,14 @@
 GIT
-  remote: https://github.com/bryanfagan/devise-two-factor.git
-  revision: 60038a699b1847266f6ce0a3457fdc2cd24715be
+  remote: https://github.com/jason-hobbs/devise-two-factor.git
+  revision: e153f16ab86de01df034672dfffa321acd891c45
+  branch: master
   specs:
-    devise-two-factor (3.1.1)
-      activesupport (< 6.1)
+    devise-two-factor (3.1.0)
+      activesupport (< 7.0)
       attr_encrypted (>= 1.3, < 4, != 2)
-      devise (~> 4.0)
-      railties (< 6.1)
-      rotp (~> 4.0)
+      devise
+      railties (< 7.0)
+      rotp (~> 6)
 
 GIT
   remote: https://github.com/mina-deploy/mina.git
@@ -595,8 +596,7 @@ GEM
       builder (>= 3.0)
       dry-inflector (~> 0.1)
       rubyzip (>= 1.0)
-    rotp (4.1.0)
-      addressable (~> 2.5)
+    rotp (6.2.0)
     rouge (3.26.0)
     rqrcode (1.2.0)
       chunky_png (~> 1.0)