diff --git a/src/service/sending.rs b/src/service/sending.rs
index c46f26d7..095f5801 100644
--- a/src/service/sending.rs
+++ b/src/service/sending.rs
@@ -256,57 +256,47 @@ impl Service {
             Span::current().record("error", e.to_string());
         }
 
-        match result {
-            Ok(()) => {
-                self.db.delete_all_active_requests_for(&destination)?;
+        if let Err(error) = result {
+            warn!(%error, "Marking transaction as failed");
+            current_transaction_status.entry(destination).and_modify(|e| {
+                use TransactionStatus::{Failed, Retrying, Running};
 
-                // Find events that have been added since starting the
-                // last request
-                let new_events = self
-                    .db
-                    .queued_requests(&destination)
-                    .filter_map(Result::ok)
-                    .take(30)
-                    .collect::<Vec<_>>();
-
-                if new_events.is_empty() {
-                    current_transaction_status.remove(&destination);
-                    Ok(None)
-                } else {
-                    // Insert pdus we found
-                    self.db.mark_as_active(&new_events)?;
-
-                    Ok(Some(HandlerInputs {
-                        destination: destination.clone(),
-                        events: new_events
-                            .into_iter()
-                            .map(|(event, _)| event)
-                            .collect(),
-                        requester_span: None,
-                    }))
-                }
-            }
-            Err(error) => {
-                warn!(%error, "Marking transaction as failed");
-                current_transaction_status.entry(destination).and_modify(|e| {
-                    *e = match e {
-                        TransactionStatus::Running => {
-                            TransactionStatus::Failed(1, Instant::now())
-                        }
-                        TransactionStatus::Retrying(n) => {
-                            TransactionStatus::Failed(*n + 1, Instant::now())
-                        }
-                        TransactionStatus::Failed(..) => {
-                            error!(
-                                "Request that was not even running failed?!"
-                            );
-                            return;
-                        }
+                *e = match e {
+                    Running => Failed(1, Instant::now()),
+                    Retrying(n) => Failed(*n + 1, Instant::now()),
+                    Failed(..) => {
+                        error!("Request that was not even running failed?!");
+                        return;
                     }
-                });
-                Ok(None)
-            }
+                }
+            });
+            return Ok(None);
         }
+
+        self.db.delete_all_active_requests_for(&destination)?;
+
+        // Find events that have been added since starting the
+        // last request
+        let new_events = self
+            .db
+            .queued_requests(&destination)
+            .filter_map(Result::ok)
+            .take(30)
+            .collect::<Vec<_>>();
+
+        if new_events.is_empty() {
+            current_transaction_status.remove(&destination);
+            return Ok(None);
+        }
+
+        // Insert pdus we found
+        self.db.mark_as_active(&new_events)?;
+
+        Ok(Some(HandlerInputs {
+            destination: destination.clone(),
+            events: new_events.into_iter().map(|(event, _)| event).collect(),
+            requester_span: None,
+        }))
     }
 
     #[tracing::instrument(