diff --git a/src/main/java/org/jboss/ejb/client/DiscoveryEJBClientInterceptor.java b/src/main/java/org/jboss/ejb/client/DiscoveryEJBClientInterceptor.java
index 22d99d80..57c0d8d8 100644
--- a/src/main/java/org/jboss/ejb/client/DiscoveryEJBClientInterceptor.java
+++ b/src/main/java/org/jboss/ejb/client/DiscoveryEJBClientInterceptor.java
@@ -347,7 +347,13 @@ ServicesQueue discover(final AbstractInvocationContext invocationContext, Filter
     }
 
     ServicesQueue discover(final FilterSpec filterSpec) {
-        return getDiscovery().discover(EJB_SERVICE_TYPE, filterSpec);
+        // EJBCLIENT-544 - if the DISCOVERY_TIMEOUT is not set or set to '0' (default), do an _infinite_ discovery,
+        // otherwise use the DISCOVERY_TIMEOUT configuration to _discover_ a ServicesQueue with the timeout set
+        if (DISCOVERY_TIMEOUT < 1) {
+            return getDiscovery().discover(EJB_SERVICE_TYPE, filterSpec);
+        } else {
+            return getDiscovery().discover(EJB_SERVICE_TYPE, filterSpec, DISCOVERY_TIMEOUT, TimeUnit.SECONDS);
+        }
     }
 
     Discovery getDiscovery() {