diff --git a/api/src/retry.rs b/api/src/retry.rs
index f29ff7d6..f7ed869c 100644
--- a/api/src/retry.rs
+++ b/api/src/retry.rs
@@ -1,7 +1,9 @@
-use reqwest::{blocking::Response, Result};
-use std::sync::atomic::{AtomicBool, Ordering::SeqCst};
-use std::thread::sleep;
-use std::time::Duration;
+use reqwest::{blocking::Response, Result, StatusCode};
+use std::{
+    sync::atomic::{AtomicBool, Ordering::SeqCst},
+    thread::sleep,
+    time::Duration,
+};
 
 /// Strategy to use if retrying .
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
@@ -60,7 +62,7 @@ impl Retrier {
             }
 
             match send_request() {
-                Ok(response) if response.status().is_server_error() => {
+                Ok(response) if should_retry(&response) => {
                     warn_and_sleep!(format!("{} for {}", response.status(), response.url()))
                 }
                 Err(error) if error.is_timeout() => warn_and_sleep!(error),
@@ -74,6 +76,14 @@ impl Retrier {
     }
 }
 
+fn should_retry(response: &Response) -> bool {
+    // TODO(mcobzarenco): we retry conflicts as a workaround for comment
+    // creation / updates conflicting with the `loom` service that indexes
+    // threads objects concurrently. We will be fixing this properly in the
+    // backend, but as a workaround we will retry conflicts for now.
+    response.status().is_server_error() || response.status() == StatusCode::CONFLICT
+}
+
 #[cfg(test)]
 mod tests {
     use super::{Retrier, RetryConfig, RetryStrategy};