diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ICoreMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ICoreMessage.java
index fe2044b0aa..45622e4449 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ICoreMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ICoreMessage.java
@@ -82,7 +82,7 @@ public interface ICoreMessage extends Message {
       map.put("durable", isDurable());
       map.put("expiration", getExpiration());
       map.put("timestamp", getTimestamp());
-      map.put("priority", (int)getPriority());
+      map.put("priority", getPriority());
 
       return map;
    }
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
index 928d375723..9dca137fc4 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
@@ -69,7 +69,7 @@ public class ActiveMQMessage implements javax.jms.Message {
       Map<String, Object> jmsMessage = new HashMap<>();
 
       String deliveryMode = (Boolean) coreMessage.get("durable") ? "PERSISTENT" : "NON_PERSISTENT";
-      byte priority = (Byte) coreMessage.get("priority");
+      int priority = (Byte) coreMessage.get("priority");
       long timestamp = (Long) coreMessage.get("timestamp");
       long expiration = (Long) coreMessage.get("expiration");
 
diff --git a/artemis-jms-client/src/test/java/org/apache/activemq/artemis/jms/client/ConversionTest.java b/artemis-jms-client/src/test/java/org/apache/activemq/artemis/jms/client/ConversionTest.java
new file mode 100644
index 0000000000..541e0cc3f1
--- /dev/null
+++ b/artemis-jms-client/src/test/java/org/apache/activemq/artemis/jms/client/ConversionTest.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.jms.client;
+
+import org.apache.activemq.artemis.api.core.ICoreMessage;
+import org.apache.activemq.artemis.core.client.impl.ClientMessageImpl;
+import org.junit.Test;
+
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Test conversion from Core message to JMS message.
+ */
+public class ConversionTest {
+
+   @Test
+   public void testCoreToJMSConversion() {
+      ICoreMessage clientMessage = new ClientMessageImpl();
+      clientMessage.setDurable(true)
+              .setPriority((byte) 9)
+              .setExpiration(123456);
+      Map<String, Object> messageMap = clientMessage.toMap();
+      Map<String, Object> jmsMap = ActiveMQMessage.coreMaptoJMSMap(messageMap);
+
+      Object priority = jmsMap.get("JMSPriority");
+      assertTrue(priority instanceof Integer);
+      assertEquals(9, priority);
+   }
+}