diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/service/HealthzService.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/service/HealthzService.scala
index 19187f4a63926c02b30b2c29c121aac5293eca21..8a3dd79a07e0d50f72f715195224f00c6eed1798 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/service/HealthzService.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/service/HealthzService.scala
@@ -16,7 +16,7 @@ sealed trait HealthMessage
 case object GetHealthMessage extends HealthMessage
 case class GetBigBlueButtonActorStatus(bbbActor: BigBlueButtonActor) extends HealthMessage
 case class SetPubSubReceiveStatus(timestamp: Long) extends HealthMessage
-case class SetPubSubSentStatus(timestamp: Long) extends HealthMessage
+case class SetPubSubStatus(sendTimestamp: Long, receiveTimestamp: Long) extends HealthMessage
 case class SetRecordingDatabaseStatus(timestamp: Long) extends HealthMessage
 
 case class GetHealthResponseMessage(
@@ -55,8 +55,7 @@ class HealthzService(system: ActorSystem) {
   }
 
   def sendPubSubStatusMessage(sendTimestamp: Long, receiveTimestamp: Long): Unit = {
-    healthActor ! SetPubSubSentStatus(sendTimestamp)
-    healthActor ! SetPubSubReceiveStatus(receiveTimestamp)
+    healthActor ! SetPubSubStatus(sendTimestamp, receiveTimestamp)
   }
 
   def sendRecordingDBStatusMessage(timestamp: Long): Unit = {
@@ -88,10 +87,9 @@ class HealthzActor extends Actor with ActorLogging {
         PubSubReceiveStatus(c2, convertLongTimestampToDateTimeString(lastReceivedTimestamp)),
         RecordingDBSendStatus(c3, convertLongTimestampToDateTimeString(recordingDBResponseTimestamp))
       )
-    case SetPubSubSentStatus(timestamp) =>
-      lastSentTimestamp = timestamp
-    case SetPubSubReceiveStatus(timestamp) =>
-      lastReceivedTimestamp = timestamp
+    case SetPubSubStatus(sendTimestamp: Long, receiveTimestamp: Long) =>
+      lastSentTimestamp = sendTimestamp
+      lastReceivedTimestamp = receiveTimestamp
     case SetRecordingDatabaseStatus(timestamp) =>
       recordingDBResponseTimestamp = timestamp
     case _ => println("unexpected message, exception could be raised")