diff --git a/c/src/exec/score/src/coremsgsubmit.c b/c/src/exec/score/src/coremsgsubmit.c
index db81013824..9b4a9d9d3c 100644
--- a/c/src/exec/score/src/coremsgsubmit.c
+++ b/c/src/exec/score/src/coremsgsubmit.c
@@ -81,6 +81,7 @@ CORE_message_queue_Status _CORE_message_queue_Submit(
       size
     );
     *(unsigned32 *)the_thread->Wait.return_argument_1 = size;
+    the_thread->Wait.count = submit_type;
     
 #if defined(RTEMS_MULTIPROCESSING)
     if ( !_Objects_Is_local_id( the_thread->Object.id ) )
diff --git a/cpukit/score/src/coremsgsubmit.c b/cpukit/score/src/coremsgsubmit.c
index db81013824..9b4a9d9d3c 100644
--- a/cpukit/score/src/coremsgsubmit.c
+++ b/cpukit/score/src/coremsgsubmit.c
@@ -81,6 +81,7 @@ CORE_message_queue_Status _CORE_message_queue_Submit(
       size
     );
     *(unsigned32 *)the_thread->Wait.return_argument_1 = size;
+    the_thread->Wait.count = submit_type;
     
 #if defined(RTEMS_MULTIPROCESSING)
     if ( !_Objects_Is_local_id( the_thread->Object.id ) )