diff --git a/modules/dcache-ftp/src/main/java/org/dcache/ftp/door/AbstractFtpDoorV1.java b/modules/dcache-ftp/src/main/java/org/dcache/ftp/door/AbstractFtpDoorV1.java
index 81c3981ddce..91cb7669051 100644
--- a/modules/dcache-ftp/src/main/java/org/dcache/ftp/door/AbstractFtpDoorV1.java
+++ b/modules/dcache-ftp/src/main/java/org/dcache/ftp/door/AbstractFtpDoorV1.java
@@ -1088,9 +1088,9 @@ protected synchronized void transferCompleted(CacheException error)
                 }
 
                 notifyBilling(0, "");
-                reply("226 Transfer complete.");
                 _completed = true;
                 setTransfer(null);
+                reply("226 Transfer complete.");
             } catch (CacheException e) {
                 abort(426, e.getMessage());
             } catch (FTPCommandException e) {
@@ -1128,13 +1128,7 @@ public void abort(int replyCode, String msg)
         public synchronized void abort(int replyCode, String replyMsg,
                                        Exception exception)
         {
-            if (_aborted) {
-                return;
-            }
-
-            if (_completed) {
-                LOGGER.error("Cannot abort transfer that already completed: {} {}",
-                        replyCode, replyMsg);
+            if (_aborted || _completed) {
                 return;
             }
 
@@ -1172,9 +1166,9 @@ public synchronized void abort(int replyCode, String replyMsg,
                 LOGGER.error("Transfer error: {} ({})", msg, exception.getMessage());
                 LOGGER.debug(exception.toString(), exception);
             }
-            reply(msg);
             _aborted = true;
             setTransfer(null);
+            reply(msg);
         }
     }