diff --git a/src/Simplex/FileTransfer/Agent.hs b/src/Simplex/FileTransfer/Agent.hs
index 7559d6673..f0bf0f7a2 100644
--- a/src/Simplex/FileTransfer/Agent.hs
+++ b/src/Simplex/FileTransfer/Agent.hs
@@ -61,6 +61,7 @@ import Simplex.Messaging.Agent.Client
 import Simplex.Messaging.Agent.Env.SQLite
 import Simplex.Messaging.Agent.Protocol
 import Simplex.Messaging.Agent.RetryInterval
+import Simplex.Messaging.Agent.Store (StoreError (SEInternal))
 import Simplex.Messaging.Agent.Store.SQLite
 import qualified Simplex.Messaging.Agent.Store.SQLite.DB as DB
 import qualified Simplex.Messaging.Crypto as C
@@ -479,12 +480,17 @@ runXFTPSndWorker c srv Worker {doWork} = do
       unlessM (doesFileExist fsFilePath) $ throwError $ INTERNAL "encrypted file doesn't exist on upload"
       let chunkSpec' = chunkSpec {filePath = fsFilePath} :: XFTPChunkSpec
       atomically $ assertAgentForeground c
+      liftIO . putStrLn $ "Uploading " <> show (sndFileId, chunkSpec)
+      withStore c $ \db -> do
+        ok <- updateSndChunkReplicaStatus db sndChunkReplicaId SFRSCreated SFRSUploading
+        if ok then pure (Right ()) else pure (Left $ SEInternal "file already uploading")
       agentXFTPUploadChunk c userId chunkDigest replica' chunkSpec'
       atomically $ waitUntilForeground c
       -- liftIO $ putStrLn $ "uploaded: " <> show chunkOffset
       sf@SndFile {sndFileEntityId, prefixPath, chunks} <- withStore c $ \db -> do
-        updateSndChunkReplicaStatus db sndChunkReplicaId SFRSUploaded
-        getSndFile db sndFileId
+        liftIO . putStrLn $ "Setting SFRSUploaded for " <> show (sndFileId, chunkSpec)
+        ok <- updateSndChunkReplicaStatus db sndChunkReplicaId SFRSUploading SFRSUploaded
+        if ok then getSndFile db sndFileId else pure (Left $ SEInternal "file upload didn't start")
       let uploaded = uploadedSize chunks
           total = totalSize chunks
           complete = all chunkUploaded chunks
diff --git a/src/Simplex/FileTransfer/Types.hs b/src/Simplex/FileTransfer/Types.hs
index ba306a6c6..ca1eec300 100644
--- a/src/Simplex/FileTransfer/Types.hs
+++ b/src/Simplex/FileTransfer/Types.hs
@@ -209,6 +209,7 @@ data SndFileChunkReplica = SndFileChunkReplica
 
 data SndFileReplicaStatus
   = SFRSCreated
+  | SFRSUploading
   | SFRSUploaded
   deriving (Eq, Show)
 
@@ -219,10 +220,12 @@ instance ToField SndFileReplicaStatus where toField = toField . textEncode
 instance TextEncoding SndFileReplicaStatus where
   textDecode = \case
     "created" -> Just SFRSCreated
+    "uploading" -> Just SFRSUploading
     "uploaded" -> Just SFRSUploaded
     _ -> Nothing
   textEncode = \case
     SFRSCreated -> "created"
+    SFRSUploading -> "uploading"
     SFRSUploaded -> "uploaded"
 
 data DeletedSndChunkReplica = DeletedSndChunkReplica
diff --git a/src/Simplex/Messaging/Agent/Store/SQLite.hs b/src/Simplex/Messaging/Agent/Store/SQLite.hs
index 4f5c1573b..0edafd7a0 100644
--- a/src/Simplex/Messaging/Agent/Store/SQLite.hs
+++ b/src/Simplex/Messaging/Agent/Store/SQLite.hs
@@ -2869,10 +2869,13 @@ addSndChunkReplicaRecipients db r@SndFileChunkReplica {sndChunkReplicaId} rcvIds
   rcvIdsKeys' <- getChunkReplicaRecipients_ db sndChunkReplicaId
   pure (r :: SndFileChunkReplica) {rcvIdsKeys = rcvIdsKeys'}
 
-updateSndChunkReplicaStatus :: DB.Connection -> Int64 -> SndFileReplicaStatus -> IO ()
-updateSndChunkReplicaStatus db replicaId status = do
+updateSndChunkReplicaStatus :: DB.Connection -> Int64 -> SndFileReplicaStatus -> SndFileReplicaStatus -> IO Bool
+updateSndChunkReplicaStatus db@DB.Connection {conn} replicaId old new = do
+  cur <- DB.query db "SELECT replica_status FROM snd_file_chunk_replicas WHERE snd_file_chunk_replica_id = ? AND replica_status = ?" (replicaId, old)
+  print (replicaId, map fromOnly cur :: [SndFileReplicaStatus])
   updatedAt <- getCurrentTime
-  DB.execute db "UPDATE snd_file_chunk_replicas SET replica_status = ?, updated_at = ? WHERE snd_file_chunk_replica_id = ?" (status, updatedAt, replicaId)
+  DB.execute db "UPDATE snd_file_chunk_replicas SET replica_status = ?, updated_at = ? WHERE snd_file_chunk_replica_id = ? AND replica_status = ?" (new, updatedAt, replicaId, old)
+  (> 0) <$> SQL.changes conn
 
 getPendingSndFilesServers :: DB.Connection -> NominalDiffTime -> IO [XFTPServer]
 getPendingSndFilesServers db ttl = do