diff --git a/src/uas/FileManager.cc b/src/uas/FileManager.cc
index bcc826a0b6dcada0381494919eaca059174dceb4..02922b6119fe168193ac12922ebabe0e9d814bab 100644
--- a/src/uas/FileManager.cc
+++ b/src/uas/FileManager.cc
@@ -215,7 +215,7 @@ void FileManager::_listAckResponse(Request* listAck)
         cListEntries++;
     }
 
-    if (listAck->hdr.size == 0) {
+    if (listAck->hdr.size == 0 || cListEntries == 0) {
         // Directory is empty, we're done
         Q_ASSERT(listAck->hdr.opcode == kRspAck);
         _currentOperation = kCOIdle;