diff --git a/electrum/gui/qt/transaction_dialog.py b/electrum/gui/qt/transaction_dialog.py
index 2a2ab46cb..2fa562cc9 100644
--- a/electrum/gui/qt/transaction_dialog.py
+++ b/electrum/gui/qt/transaction_dialog.py
@@ -875,7 +875,9 @@ class PreviewTxDialog(BaseTxDialog, TxEditor):
         assert self.tx
         self.finalized = True
         self.tx.set_rbf(self.rbf_cb.isChecked())
-        self.tx.locktime = self.locktime_e.get_locktime()
+        locktime = self.locktime_e.get_locktime()
+        if locktime is not None:
+            self.tx.locktime = self.locktime_e.get_locktime()
         for widget in [self.fee_slider, self.fee_combo, self.feecontrol_fields, self.rbf_cb,
                        self.locktime_setter_widget, self.locktime_e]:
             widget.setEnabled(False)
diff --git a/electrum/transaction.py b/electrum/transaction.py
index 2fb5c3786..83eede68c 100644
--- a/electrum/transaction.py
+++ b/electrum/transaction.py
@@ -546,7 +546,8 @@ class Transaction:
         return self._locktime
 
     @locktime.setter
-    def locktime(self, value):
+    def locktime(self, value: int):
+        assert isinstance(value, int), f"locktime must be int, not {value!r}"
         self._locktime = value
         self.invalidate_ser_cache()