diff --git a/htp/htp_connection.c b/htp/htp_connection.c
index 3fe7c899..0785145d 100644
--- a/htp/htp_connection.c
+++ b/htp/htp_connection.c
@@ -81,6 +81,9 @@ void htp_conn_destroy(htp_conn_t *conn) {
         for (size_t i = 0, n = htp_list_size(conn->transactions); i < n; i++) {
             htp_tx_t *tx = htp_list_get(conn->transactions, i);
             if (tx != NULL) {
+                // nullify conn so as not to call htp_conn_remove_tx
+                // since we remove all txs
+                tx->conn = NULL;
                 htp_tx_destroy_incomplete(tx);
             }
         }
@@ -148,10 +151,11 @@ htp_status_t htp_conn_open(htp_conn_t *conn, const char *client_addr, int client
 htp_status_t htp_conn_remove_tx(htp_conn_t *conn, const htp_tx_t *tx) {
     if ((tx == NULL) || (conn == NULL)) return HTP_ERROR;
     if (conn->transactions == NULL) return HTP_ERROR;
-    for (size_t i = 0, n = htp_list_size(conn->transactions); i < n; i++) {
-        htp_tx_t *tx2 = htp_list_get(conn->transactions, i);
-        if (tx2 == tx) {
-            return htp_list_replace(conn->transactions, i, NULL);
+    size_t n = htp_list_size(conn->transactions);
+    if (n > 0) {
+        htp_tx_t *tx2 = htp_list_get(conn->transactions, n - 1);
+        if (tx2 != NULL) {
+            return htp_list_replace(conn->transactions, n - 1 + tx->index - tx2->index, NULL);
         }
     }
     return HTP_DECLINED;
diff --git a/htp/htp_transaction.c b/htp/htp_transaction.c
index 7220459d..6ba9ac13 100644
--- a/htp/htp_transaction.c
+++ b/htp/htp_transaction.c
@@ -61,7 +61,13 @@ htp_tx_t *htp_tx_create(htp_connp_t *connp) {
 
     tx->connp = connp;
     tx->conn = connp->conn;
-    tx->index = htp_list_size(tx->conn->transactions);
+    tx->index = 0;
+    if (htp_list_size(tx->conn->transactions) > 0) {
+        htp_tx_t *txl = htp_list_get(tx->conn->transactions, htp_list_size(tx->conn->transactions) - 1);
+        if (txl != NULL) {
+            tx->index = txl->index + 1;
+        }
+    }
     tx->cfg = connp->cfg;
     tx->is_config_shared = HTP_CONFIG_SHARED;