diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
index 8d7dd6fe74..3864b5c84e 100644
--- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
+++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
@@ -134,7 +134,7 @@ public class ActiveMQResourceAdapter extends ActiveMQConnectionSupport implement
         }
         String userName = defaultValue(activationSpec.getUserName(), getInfo().getUserName());
         String password = defaultValue(activationSpec.getPassword(), getInfo().getPassword());
-        String clientId = activationSpec.getClientId();
+        String clientId = defaultValue(activationSpec.getClientId(), getInfo().getClientid());
         if (clientId != null) {
             cf.setClientID(clientId);
         } else {