diff --git a/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/interceptor/DeadlineSetupClientInterceptor.java b/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/interceptor/DeadlineSetupClientInterceptor.java
index 60b1a6081..5a7910c86 100644
--- a/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/interceptor/DeadlineSetupClientInterceptor.java
+++ b/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/interceptor/DeadlineSetupClientInterceptor.java
@@ -45,7 +45,7 @@ public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
             final CallOptions callOptions,
             final Channel next) {
 
-        if (defaultDeadline != null) {
+        if (defaultDeadline != null && callOptions.getDeadline() == null) {
             return next.newCall(method,
                     callOptions.withDeadlineAfter(defaultDeadline.toMillis(), TimeUnit.MILLISECONDS));
         } else {