diff --git a/example/pubspec.lock b/example/pubspec.lock
index 9c46e8f..979e942 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -683,7 +683,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.1.5"
+    version: "0.1.6"
   vector_math:
     dependency: transitive
     description:
diff --git a/lib/src/4337/wallet.dart b/lib/src/4337/wallet.dart
index 41336dc..8ad2bf3 100644
--- a/lib/src/4337/wallet.dart
+++ b/lib/src/4337/wallet.dart
@@ -149,7 +149,6 @@ class SmartWallet with _PluginManager, _GasSettings implements SmartWalletBase {
   @override
   Future<UserOperationResponse> sendUserOperation(UserOperation op) =>
       prepareUserOperation(op)
-          .then(applyCustomGasSettings)
           .then(signUserOperation)
           .then(sendSignedUserOperation);
 
@@ -158,6 +157,10 @@ class SmartWallet with _PluginManager, _GasSettings implements SmartWalletBase {
       {bool update = true}) async {
     // Update the user operation with the latest nonce and gas prices if needed
     if (update) op = await _updateUserOperation(op);
+
+    // Apply custom gas settings
+    op = applyCustomGasSettings(op);
+
     // If the 'paymaster' plugin is enabled, intercept the user operation
     if (hasPlugin('paymaster')) {
       op = await plugin<Paymaster>('paymaster').intercept(op);