diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
index 0b46b20da6..f80342b4f4 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
@@ -696,11 +696,6 @@ public class ActiveMQActivationSpec extends ConnectionFactoryProperties implemen
             propsNotSet.add(new PropertyDescriptor("subscriptionName", ActiveMQActivationSpec.class));
             errorMessages.add("If subscription is durable then subscription name must be specified.");
          }
-
-         if ((isSubscriptionDurable() && getClientID() == null) || (isSubscriptionDurable() && getClientID() != null && getClientID().length() == 0)) {
-            propsNotSet.add(new PropertyDescriptor("clientID", ActiveMQActivationSpec.class));
-            errorMessages.add("If subscription is durable then clientID must be specified.");
-         }
       }
       catch (IntrospectionException e) {
          e.printStackTrace();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerTest.java
index 7f94f81eea..a5636cfc80 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerTest.java
@@ -714,65 +714,6 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase {
       }
    }
 
-   @Test
-   public void testNullClientID() throws Exception {
-      ActiveMQResourceAdapter qResourceAdapter = newResourceAdapter();
-      MyBootstrapContext ctx = new MyBootstrapContext();
-      qResourceAdapter.start(ctx);
-
-      ActiveMQActivationSpec spec = new ActiveMQActivationSpec();
-      spec.setResourceAdapter(qResourceAdapter);
-      spec.setUseJNDI(false);
-      spec.setDestination("mdbTopic");
-      spec.setSubscriptionDurability("Durable");
-      spec.setSubscriptionName("sub");
-      spec.setSetupAttempts(1);
-      spec.setShareSubscriptions(true);
-      spec.setMaxSession(1);
-
-      CountDownLatch latch = new CountDownLatch(5);
-      DummyMessageEndpoint endpoint = new DummyMessageEndpoint(latch);
-      DummyMessageEndpointFactory endpointFactory = new DummyMessageEndpointFactory(endpoint, false);
-      try {
-         qResourceAdapter.endpointActivation(endpointFactory, spec);
-         fail();
-      }
-      catch (Exception e) {
-         assertTrue(e instanceof InvalidPropertyException);
-         assertEquals("clientID", ((InvalidPropertyException) e).getInvalidPropertyDescriptors()[0].getName());
-      }
-   }
-
-   @Test
-   public void testEmptyClientID() throws Exception {
-      ActiveMQResourceAdapter qResourceAdapter = newResourceAdapter();
-      MyBootstrapContext ctx = new MyBootstrapContext();
-      qResourceAdapter.start(ctx);
-
-      ActiveMQActivationSpec spec = new ActiveMQActivationSpec();
-      spec.setResourceAdapter(qResourceAdapter);
-      spec.setUseJNDI(false);
-      spec.setDestination("mdbTopic");
-      spec.setSubscriptionDurability("Durable");
-      spec.setSubscriptionName("sub");
-      spec.setClientID("");
-      spec.setSetupAttempts(1);
-      spec.setShareSubscriptions(true);
-      spec.setMaxSession(1);
-
-      CountDownLatch latch = new CountDownLatch(5);
-      DummyMessageEndpoint endpoint = new DummyMessageEndpoint(latch);
-      DummyMessageEndpointFactory endpointFactory = new DummyMessageEndpointFactory(endpoint, false);
-      try {
-         qResourceAdapter.endpointActivation(endpointFactory, spec);
-         fail();
-      }
-      catch (Exception e) {
-         assertTrue(e instanceof InvalidPropertyException);
-         assertEquals("clientID", ((InvalidPropertyException) e).getInvalidPropertyDescriptors()[0].getName());
-      }
-   }
-
    @Test
    public void testBadDestinationType() throws Exception {
       ActiveMQResourceAdapter qResourceAdapter = newResourceAdapter();