diff --git a/writer/StreamWriter.cpp b/writer/StreamWriter.cpp
index 0c152554..247aab01 100644
--- a/writer/StreamWriter.cpp
+++ b/writer/StreamWriter.cpp
@@ -164,12 +164,11 @@ void StreamWriter::ProcessEndMessage() {
             err = e.what();
         }
     }
-    bool error_state = (state == StreamWriterState::Error);
 
     FinalizeDataCollection();
 
-    // Notifications happen only when handling END message
-    // No end message ==> no need to ACK
+    const bool error_state = (state == StreamWriterState::Error);
+
     NotifyReceiverOnFinalizedWrite(writer_notification_zmq_addr);
     NotifyTcpAck(TCPFrameType::END, !error_state, error_state,
                  error_state ? TCPAckCode::EndFailed : TCPAckCode::None,