diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/QueueQueryResult.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/QueueQueryResult.java
index cf88d6224c..3fd818d7d3 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/QueueQueryResult.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/QueueQueryResult.java
@@ -138,8 +138,4 @@ public class QueueQueryResult {
    public int getMaxConsumers() {
       return maxConsumers;
    }
-
-   public void setAddress(SimpleString address) {
-      this.address = address;
-   }
 }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
index bd8c395255..8e557d3b06 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
@@ -728,16 +728,7 @@ public class ServerSessionImpl implements ServerSession, FailureListener {
 
    @Override
    public QueueQueryResult executeQueueQuery(final SimpleString name) throws Exception {
-      QueueQueryResult result = server.queueQuery(removePrefix(name));
-      if (prefixEnabled) {
-         for (Map.Entry<SimpleString, RoutingType> entry : prefixes.entrySet()) {
-            if (entry.getValue() == result.getRoutingType()) {
-               result.setAddress(entry.getKey().concat(result.getAddress()));
-               break;
-            }
-         }
-      }
-      return result;
+      return server.queueQuery(removePrefix(name));
    }
 
    @Override
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java
index de2cc236cf..9954a4e617 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java
@@ -21,9 +21,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.activemq.artemis.api.core.ActiveMQException;
 import org.apache.activemq.artemis.api.core.ActiveMQInternalErrorException;
-import org.apache.activemq.artemis.api.core.RoutingType;
 import org.apache.activemq.artemis.api.core.SimpleString;
-import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
 import org.apache.activemq.artemis.api.core.client.ClientConsumer;
 import org.apache.activemq.artemis.api.core.client.ClientMessage;
 import org.apache.activemq.artemis.api.core.client.ClientProducer;
@@ -34,7 +32,6 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator;
 import org.apache.activemq.artemis.api.core.client.SessionFailureListener;
 import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
 import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.artemis.core.config.Configuration;
 import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.apache.activemq.artemis.core.server.Queue;
 import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
@@ -62,11 +59,8 @@ public class SessionTest extends ActiveMQTestBase {
    public void setUp() throws Exception {
       super.setUp();
 
-      locator = createNettyNonHALocator();
-      Configuration configuration = createDefaultNettyConfig();
-      configuration.addAcceptorConfiguration("prefixed", "tcp://localhost:61617?multicastPrefix=multicast://;anycastPrefix=anycast://");
-      server = createServer(configuration);
-      createServer(false);
+      locator = createInVMNonHALocator();
+      server = createServer(false);
       server.start();
       waitForServerToStart(server);
    }
@@ -212,24 +206,6 @@ public class SessionTest extends ActiveMQTestBase {
       clientSession.close();
    }
 
-   @Test
-   public void testQueueQueryWithAddressPrefix() throws Exception {
-      String address = new String("testAddress");
-
-      cf = ActiveMQClient.createServerLocator("tcp://localhost:61617").createSessionFactory();
-      ClientSession clientSession = cf.createSession(false, true, true);
-
-      clientSession.createQueue(address, RoutingType.ANYCAST, queueName + "1", false);
-      clientSession.createQueue(address, RoutingType.MULTICAST, queueName + "2", false);
-
-      QueueQuery respA = clientSession.queueQuery(new SimpleString(queueName + "1"));
-      QueueQuery respM = clientSession.queueQuery(new SimpleString(queueName + "2"));
-
-      Assert.assertEquals(new SimpleString("anycast://" + address), respA.getAddress());
-      Assert.assertEquals(new SimpleString("multicast://" + address), respM.getAddress());
-      clientSession.close();
-   }
-
    private void flushQueue() throws Exception {
       Queue queue = server.locateQueue(SimpleString.toSimpleString(queueName));
       assertNotNull(queue);