diff --git a/src/main/java/hlf/java/rest/client/config/FabricProperties.java b/src/main/java/hlf/java/rest/client/config/FabricProperties.java
index 59a281c..3e15a1e 100644
--- a/src/main/java/hlf/java/rest/client/config/FabricProperties.java
+++ b/src/main/java/hlf/java/rest/client/config/FabricProperties.java
@@ -22,6 +22,7 @@ public class FabricProperties {
       "org.hyperledger.fabric.sdk.service_discovery.as_localhost";
 
   private boolean localhostReportAddress;
+  private boolean discoveryEnabled = true;
   private WalletConfig wallet;
   private OrgConnectionConfig orgConnectionConfig;
   private Client client;
diff --git a/src/main/java/hlf/java/rest/client/config/GatewayConfig.java b/src/main/java/hlf/java/rest/client/config/GatewayConfig.java
index a9134b5..3efdf7b 100644
--- a/src/main/java/hlf/java/rest/client/config/GatewayConfig.java
+++ b/src/main/java/hlf/java/rest/client/config/GatewayConfig.java
@@ -48,7 +48,7 @@ public Gateway gateway(Wallet wallet) throws IOException {
     builder
         .identity(wallet, fabricProperties.getWallet().getClientUser().getName())
         .networkConfig(networkConfigPath)
-        .discovery(true);
+        .discovery(fabricProperties.isDiscoveryEnabled());
     return builder.connect();
   }
 
diff --git a/src/main/resources/application.template b/src/main/resources/application.template
index bfb3d6a..51a1239 100644
--- a/src/main/resources/application.template
+++ b/src/main/resources/application.template
@@ -16,6 +16,7 @@ metrics:
       enable: false
 fabric:
   localhostReportAddress: true
+  discoveryEnabled: true
   wallet:
     path: wallet
     adminUser: