diff --git a/src/message_sender.c b/src/message_sender.c
index 25cfe1c5..444f8978 100644
--- a/src/message_sender.c
+++ b/src/message_sender.c
@@ -805,8 +805,6 @@ int messagesender_close(MESSAGE_SENDER_HANDLE message_sender)
     }
     else
     {
-        indicate_all_messages_as_error(message_sender);
-
         if ((message_sender->message_sender_state == MESSAGE_SENDER_STATE_OPENING) ||
             (message_sender->message_sender_state == MESSAGE_SENDER_STATE_OPEN))
         {
@@ -826,6 +824,8 @@ int messagesender_close(MESSAGE_SENDER_HANDLE message_sender)
         {
             result = 0;
         }
+        
+        indicate_all_messages_as_error(message_sender);
     }
 
     return result;