diff --git a/electrum/gui/qml/components/ConfirmTxDialog.qml b/electrum/gui/qml/components/ConfirmTxDialog.qml
index 4eab721f3..46c9cef24 100644
--- a/electrum/gui/qml/components/ConfirmTxDialog.qml
+++ b/electrum/gui/qml/components/ConfirmTxDialog.qml
@@ -178,18 +178,6 @@ ElDialog {
                 feeslider: finalizer
             }
 
-            CheckBox {
-                id: final_cb
-                text: qsTr('Replace-by-Fee')
-                Layout.columnSpan: 2
-                checked: finalizer.rbf
-                visible: finalizer.canRbf
-                onCheckedChanged: {
-                    if (activeFocus)
-                        finalizer.rbf = checked
-                }
-            }
-
             InfoTextArea {
                 Layout.columnSpan: 2
                 Layout.preferredWidth: parent.width * 3/4
diff --git a/electrum/gui/qml/components/RbfBumpFeeDialog.qml b/electrum/gui/qml/components/RbfBumpFeeDialog.qml
index 535b1f110..0b1390897 100644
--- a/electrum/gui/qml/components/RbfBumpFeeDialog.qml
+++ b/electrum/gui/qml/components/RbfBumpFeeDialog.qml
@@ -147,17 +147,6 @@ ElDialog {
                 feeslider: rbffeebumper
             }
 
-            CheckBox {
-                id: final_cb
-                text: qsTr('Replace-by-Fee')
-                Layout.columnSpan: 2
-                checked: rbffeebumper.rbf
-                onCheckedChanged: {
-                    if (activeFocus)
-                        rbffeebumper.rbf = checked
-                }
-            }
-
             InfoTextArea {
                 Layout.columnSpan: 2
                 Layout.preferredWidth: parent.width * 3/4
diff --git a/electrum/gui/qml/components/WalletMainView.qml b/electrum/gui/qml/components/WalletMainView.qml
index 8b1816d39..7c269799d 100644
--- a/electrum/gui/qml/components/WalletMainView.qml
+++ b/electrum/gui/qml/components/WalletMainView.qml
@@ -308,7 +308,7 @@ Item {
             title: qsTr('Confirm Payment')
             finalizer: TxFinalizer {
                 wallet: Daemon.currentWallet
-                canRbf: Config.useRbf
+                canRbf: true
             }
             onClosed: destroy()
         }
diff --git a/electrum/gui/qml/qetxfinalizer.py b/electrum/gui/qml/qetxfinalizer.py
index d177bd218..6248b1771 100644
--- a/electrum/gui/qml/qetxfinalizer.py
+++ b/electrum/gui/qml/qetxfinalizer.py
@@ -280,8 +280,7 @@ class QETxFinalizer(TxFeeSlider):
         if self._canRbf != canRbf:
             self._canRbf = canRbf
             self.canRbfChanged.emit()
-            if not canRbf and self.rbf:
-                self.rbf = False
+        self.rbf = self._canRbf # if we can RbF, we do RbF
 
     @profiler
     def make_tx(self, amount):