diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java
index 51a89e331f..0ff0a2194b 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java
@@ -267,8 +267,6 @@ public class ActiveMQConnection extends ActiveMQConnectionForContextImpl impleme
    public ConnectionMetaData getMetaData() throws JMSException {
       checkClosed();
 
-      justCreated = false;
-
       if (metaData == null) {
          metaData = new ActiveMQConnectionMetaData(thisVersion);
       }
@@ -323,7 +321,6 @@ public class ActiveMQConnection extends ActiveMQConnectionForContextImpl impleme
          session.stop();
       }
 
-      justCreated = false;
       started = false;
    }
 
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java
index 2d89713c25..8aac28066c 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java
@@ -97,6 +97,15 @@ public class ConnectionTest extends JMSTestCase {
       connection2.setClientID(clientID);
    }
 
+   @Test
+   public void testSetClientIdAfterStop() throws Exception {
+      try (Connection connection = createConnection()) {
+         connection.stop();
+         connection.setClientID("clientId");
+      }
+   }
+
+
    @Test
    public void testSetClientAfterStart() throws Exception {
       Connection connection = null;
@@ -174,6 +183,14 @@ public class ConnectionTest extends JMSTestCase {
       connection.close();
    }
 
+   @Test
+   public void testSetClientIdAfterGetMetadata() throws Exception {
+      try (Connection connection = createConnection()) {
+         connection.getMetaData();
+         connection.setClientID("clientId");
+      }
+   }
+
    /**
     * Test creation of QueueSession
     */