diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e7ba753..341f1a26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -82,6 +82,7 @@ will consitute of a breaking change warranting a new major release:
 - HK TM store: The HK store dump success event was triggered for cancelled HK dumps.
 - When a PUS parsing error occured while parsing a TM store file, the dump completion procedure
   was always executed.
+- Some smaller logic fixes in the TM store base class
 
 # [v2.0.5] 2023-05-11
 
diff --git a/mission/tmtc/PersistentTmStore.cpp b/mission/tmtc/PersistentTmStore.cpp
index 7c3738fc..8174f8a0 100644
--- a/mission/tmtc/PersistentTmStore.cpp
+++ b/mission/tmtc/PersistentTmStore.cpp
@@ -256,6 +256,7 @@ ReturnValue_t PersistentTmStore::getNextDumpPacket(PusTmReader& reader, bool& fi
   if (state == State::IDLE or dumpParams.pendingPacketDump) {
     return returnvalue::FAILED;
   }
+  fileHasSwapped = false;
   reader.setReadOnlyData(fileBuf.data() + dumpParams.currentSize,
                          fileBuf.size() - dumpParams.currentSize);
   // CRC check to fully ensure this is a valid TM
@@ -270,7 +271,6 @@ ReturnValue_t PersistentTmStore::getNextDumpPacket(PusTmReader& reader, bool& fi
     fileHasSwapped = true;
     return loadNextDumpFile();
   }
-  fileHasSwapped = false;
   dumpParams.pendingPacketDump = true;
   return returnvalue::OK;
 }