Index: trunk/FACT++/src/EventBuilderWrapper.h
===================================================================
--- trunk/FACT++/src/EventBuilderWrapper.h	(revision 15156)
+++ trunk/FACT++/src/EventBuilderWrapper.h	(revision 15157)
@@ -1069,4 +1069,9 @@
     }
 
+    bool IsRunFileOpen()
+    {
+        return fLastOpened==fRunNumber-1;
+    }
+
     bool IncreaseRunNumber(uint32_t run)
     {
Index: trunk/FACT++/src/fadctrl.cc
===================================================================
--- trunk/FACT++/src/fadctrl.cc	(revision 15156)
+++ trunk/FACT++/src/fadctrl.cc	(revision 15157)
@@ -1593,5 +1593,5 @@
             }
 
-            return GetNumFilesOpen()>0 ? FAD::State::kWritingData : FAD::State::kConnected;
+            return GetNumFilesOpen()>0 && IsRunFileOpen() ? FAD::State::kWritingData : FAD::State::kConnected;
         }
 
@@ -1691,5 +1691,5 @@
 
         T::AddStateName(FAD::State::kWritingData, "WritingData",
-                        "The event builder has an open file (that does not mean that new events are currently received)");
+                        "The event builder has an open file which belongs to the last run started (that does not mean that new events are currently received)");
 
         // FAD Commands