diff --git a/build.gradle b/build.gradle
index 11addf46651..7ecf8959d5d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -411,6 +411,8 @@ configure(project(':statsnode')) {
 configure(project(':grpc')) {
     apply plugin: 'com.google.protobuf'
 
+    mainClassName = 'bisq.grpc.BisqGrpcServerMain'
+
     sourceSets.main.java.srcDir "$buildDir/generated/source/proto/main/java"
 
     protobuf {
diff --git a/grpc/src/main/java/bisq/grpc/BisqGrpcClient.java b/grpc/src/main/java/bisq/grpc/BisqGrpcClient.java
index ee09ce4df3d..86b4b240f4e 100644
--- a/grpc/src/main/java/bisq/grpc/BisqGrpcClient.java
+++ b/grpc/src/main/java/bisq/grpc/BisqGrpcClient.java
@@ -22,11 +22,12 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-
-
 import bisq.grpc.protobuf.GetBalanceRequest;
 import bisq.grpc.protobuf.GetVersionRequest;
 import bisq.grpc.protobuf.StopServerRequest;
+import bisq.grpc.protobuf.GetBalanceGrpc;
+import bisq.grpc.protobuf.GetVersionGrpc;
+import bisq.grpc.protobuf.StopServerGrpc;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.StatusRuntimeException;
diff --git a/grpc/src/main/java/bisq/grpc/BisqGrpcServer.java b/grpc/src/main/java/bisq/grpc/BisqGrpcServer.java
index df8f994d890..026ab653ac2 100644
--- a/grpc/src/main/java/bisq/grpc/BisqGrpcServer.java
+++ b/grpc/src/main/java/bisq/grpc/BisqGrpcServer.java
@@ -23,14 +23,15 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-
-
 import bisq.grpc.protobuf.GetBalanceReply;
 import bisq.grpc.protobuf.GetBalanceRequest;
+import bisq.grpc.protobuf.GetBalanceGrpc;
 import bisq.grpc.protobuf.GetVersionReply;
 import bisq.grpc.protobuf.GetVersionRequest;
+import bisq.grpc.protobuf.GetVersionGrpc;
 import bisq.grpc.protobuf.StopServerReply;
 import bisq.grpc.protobuf.StopServerRequest;
+import bisq.grpc.protobuf.StopServerGrpc;
 import io.grpc.Server;
 import io.grpc.ServerBuilder;
 import io.grpc.stub.StreamObserver;