diff --git a/src/dump.h b/src/dump.h
index 35da154d7c..482e87a207 100644
--- a/src/dump.h
+++ b/src/dump.h
@@ -19,6 +19,7 @@
 namespace LAMMPS_NS {
 
 class Dump : protected Pointers {
+ friend class Output;
  public:
   char *id;                // user-defined name of Dump
   char *style;             // style of Dump
diff --git a/src/output.cpp b/src/output.cpp
index 449077d1fb..1376d365d8 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -632,7 +632,7 @@ int Output::check_time_dumps(bigint ntimestep)
  {
    next_dump_any = MAXBIGINT;
    for (int idump = 0; idump < ndump; idump++)
-     if ((last_dump[idump] >= 0) && !update->whichflag)
+     if ((last_dump[idump] >= 0) && !update->whichflag && !dump[idump]->multifile)
        error->all(FLERR, "Cannot reset timestep with active dump - must undump first");
 
    if (restart_flag_single) {