diff --git a/app/models/repository.rb b/app/models/repository.rb
index e05d3dd58ac..d43f991bb3e 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -1077,7 +1077,7 @@ class Repository
   end
 
   def rebase(user, merge_request)
-    if Feature.disabled?(:two_step_rebase, default_enabled: true)
+    if Feature.disabled?(:two_step_rebase, default_enabled: false)
       return rebase_deprecated(user, merge_request)
     end
 
diff --git a/changelogs/unreleased/dm-disable-two-step-rebase.yml b/changelogs/unreleased/dm-disable-two-step-rebase.yml
new file mode 100644
index 00000000000..342d61a20d6
--- /dev/null
+++ b/changelogs/unreleased/dm-disable-two-step-rebase.yml
@@ -0,0 +1,5 @@
+---
+title: Disable two-step rebase which could cause rebases to hang
+merge_request: 28778
+author:
+type: other