diff --git a/src/cli.rs b/src/cli.rs
index fb28c07..0ab0256 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -307,6 +307,7 @@ pub async fn run() -> Result<()> {
     let (trade_keys, trade_index) = User::get_next_trade_keys(&pool)
         .await
         .map_err(|e| anyhow::anyhow!("Failed to get trade keys: {}", e))?;
+
     // Mostro pubkey
     let mostro_key = PublicKey::from_str(&pubkey)?;
 
diff --git a/src/cli/get_dm.rs b/src/cli/get_dm.rs
index 892aabb..010d3f9 100644
--- a/src/cli/get_dm.rs
+++ b/src/cli/get_dm.rs
@@ -85,7 +85,7 @@ pub async fn execute_get_dm(
                             // Update last trade index
                             match User::get(&pool).await {
                                 Ok(mut user) => {
-                                    user.set_last_trade_index(trade_index + 1);
+                                    user.set_last_trade_index(trade_index);
                                     if let Err(e) = user.save(&pool).await {
                                         println!("Failed to update user: {}", e);
                                     }
diff --git a/src/cli/new_order.rs b/src/cli/new_order.rs
index 48ab6e2..2cac989 100644
--- a/src/cli/new_order.rs
+++ b/src/cli/new_order.rs
@@ -182,7 +182,7 @@ pub async fn execute_new_order(
         // Update last trade index
         match User::get(&pool).await {
             Ok(mut user) => {
-                user.set_last_trade_index(trade_index + 1);
+                user.set_last_trade_index(trade_index);
                 if let Err(e) = user.save(&pool).await {
                     println!("Failed to update user: {}", e);
                 }
diff --git a/src/cli/send_msg.rs b/src/cli/send_msg.rs
index 6b4c20d..4b5a299 100644
--- a/src/cli/send_msg.rs
+++ b/src/cli/send_msg.rs
@@ -102,7 +102,7 @@ pub async fn execute_send_msg(
                     // Update last trade index
                     match User::get(&pool).await {
                         Ok(mut user) => {
-                            user.set_last_trade_index(trade_index + 1);
+                            user.set_last_trade_index(trade_index);
                             if let Err(e) = user.save(&pool).await {
                                 println!("Failed to update user: {}", e);
                             }
diff --git a/src/cli/take_buy.rs b/src/cli/take_buy.rs
index 5493608..e759903 100644
--- a/src/cli/take_buy.rs
+++ b/src/cli/take_buy.rs
@@ -95,7 +95,7 @@ pub async fn execute_take_buy(
                 // Update last trade index to be used in next trade
                 match User::get(&pool).await {
                     Ok(mut user) => {
-                        user.set_last_trade_index(trade_index + 1);
+                        user.set_last_trade_index(trade_index);
                         if let Err(e) = user.save(&pool).await {
                             println!("Failed to update user: {}", e);
                         }
diff --git a/src/cli/take_sell.rs b/src/cli/take_sell.rs
index 3e77419..840f37b 100644
--- a/src/cli/take_sell.rs
+++ b/src/cli/take_sell.rs
@@ -117,7 +117,7 @@ pub async fn execute_take_sell(
             // Update last trade index to be used in next trade
             match User::get(&pool).await {
                 Ok(mut user) => {
-                    user.set_last_trade_index(trade_index + 1);
+                    user.set_last_trade_index(trade_index);
                     if let Err(e) = user.save(&pool).await {
                         println!("Failed to update user: {}", e);
                     }
diff --git a/src/db.rs b/src/db.rs
index 22ef245..0b687f9 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -170,8 +170,7 @@ impl User {
     }
 
     pub async fn get_next_trade_keys(pool: &SqlitePool) -> Result<(Keys, i64)> {
-        let mut trade_index = User::get_next_trade_index(pool.clone()).await?;
-        trade_index -= 1;
+        let trade_index = User::get_next_trade_index(pool.clone()).await?;
 
         let user = User::get(pool).await?;
         let account = NOSTR_REPLACEABLE_EVENT_KIND as u32;