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..80c4a7a 100644
--- a/src/main/resources/application.template
+++ b/src/main/resources/application.template
@@ -1,6 +1,6 @@
 spring:
   profiles.active: local
-  
+
 ---
 springdoc:
   version: 1.0.0
@@ -15,6 +15,7 @@ metrics:
     kafka:
       enable: false
 fabric:
+  discoveryEnabled: true
   localhostReportAddress: true
   wallet:
     path: wallet
@@ -74,7 +75,7 @@ spring:
   profiles: container
   devtools.add-properties: false
   localhostReportAddress: false
-  
+
 ---
 spring:
   profiles: qa
@@ -86,11 +87,10 @@ spring:
   profiles: stg
   devtools.add-properties: false
   localhostReportAddress: false
-  
-  
+
+
 ---
 spring:
-  profiles: prod  
+  profiles: prod
   devtools.add-properties: false
   localhostReportAddress: false
-  
\ No newline at end of file