diff --git a/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/autoconfigure/GrpcClientDeadlineAutoConfiguration.java b/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/autoconfigure/GrpcClientDeadlineAutoConfiguration.java
index 9782cc404..7b9c3ac0d 100644
--- a/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/autoconfigure/GrpcClientDeadlineAutoConfiguration.java
+++ b/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/autoconfigure/GrpcClientDeadlineAutoConfiguration.java
@@ -18,8 +18,6 @@
 
 import static java.util.Objects.requireNonNull;
 
-import java.time.Duration;
-
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -32,7 +30,6 @@
 import net.devh.boot.grpc.client.config.GrpcChannelsProperties;
 import net.devh.boot.grpc.client.inject.StubTransformer;
 import net.devh.boot.grpc.client.interceptor.DeadlineSetupClientInterceptor;
-import net.devh.boot.grpc.client.interceptor.GrpcGlobalClientInterceptor;
 
 /**
  * The deadline autoconfiguration for the client.
@@ -52,9 +49,6 @@
 @AutoConfigureBefore(GrpcClientAutoConfiguration.class)
 public class GrpcClientDeadlineAutoConfiguration {
 
-    private final CallOptions.Key<Duration> deadlineDuration =
-            CallOptions.Key.createWithDefault("deadlineDuration", null);
-
     /**
      * Creates a {@link StubTransformer} bean that will add the deadlineDuration to the callOptions for using in
      * DeadlineSetupClientInterceptor.
@@ -71,16 +65,11 @@ StubTransformer deadlineStubTransformer(final GrpcChannelsProperties props) {
             GrpcChannelProperties channelProps = props.getChannel(name);
             if (channelProps != null && channelProps.getDeadline() != null
                     && channelProps.getDeadline().toMillis() > 0L) {
-                return stub.withOption(deadlineDuration, channelProps.getDeadline());
+                return stub.withInterceptors(new DeadlineSetupClientInterceptor(channelProps.getDeadline()));
             } else {
                 return stub;
             }
         };
     }
 
-    @GrpcGlobalClientInterceptor
-    DeadlineSetupClientInterceptor deadlineClientInterceptor() {
-        return new DeadlineSetupClientInterceptor(deadlineDuration);
-    }
-
 }
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 4ff2329c5..3314466f8 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
@@ -37,7 +37,7 @@
 @RequiredArgsConstructor
 public class DeadlineSetupClientInterceptor implements ClientInterceptor {
 
-    private final CallOptions.Key<Duration> deadlineDuration;
+    private final Duration defaultDeadline;
 
     @Override
     public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
@@ -45,9 +45,9 @@ public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
             final CallOptions callOptions,
             final Channel next) {
 
-        Duration duration = callOptions.getOption(deadlineDuration);
-        if (duration != null) {
-            return next.newCall(method, callOptions.withDeadlineAfter(duration.toMillis(), TimeUnit.MILLISECONDS));
+        if (defaultDeadline != null) {
+            return next.newCall(method,
+                    callOptions.withDeadlineAfter(defaultDeadline.toMillis(), TimeUnit.MILLISECONDS));
         } else {
             return next.newCall(method, callOptions);
         }
diff --git a/tests/src/test/java/net/devh/boot/grpc/test/interceptor/DefaultClientInterceptorTest.java b/tests/src/test/java/net/devh/boot/grpc/test/interceptor/DefaultClientInterceptorTest.java
index 2db639b4c..17a51b931 100644
--- a/tests/src/test/java/net/devh/boot/grpc/test/interceptor/DefaultClientInterceptorTest.java
+++ b/tests/src/test/java/net/devh/boot/grpc/test/interceptor/DefaultClientInterceptorTest.java
@@ -33,7 +33,6 @@
 import io.micrometer.core.instrument.binder.grpc.MetricCollectingClientInterceptor;
 import io.micrometer.core.instrument.binder.grpc.ObservationGrpcClientInterceptor;
 import net.devh.boot.grpc.client.autoconfigure.GrpcClientAutoConfiguration;
-import net.devh.boot.grpc.client.interceptor.DeadlineSetupClientInterceptor;
 import net.devh.boot.grpc.client.interceptor.GlobalClientInterceptorRegistry;
 import net.devh.boot.grpc.client.metrics.MetricsClientInterceptor;
 
@@ -55,7 +54,6 @@ void testDefaultInterceptors() {
         expected.add(this.applicationContext.getBean(MetricCollectingClientInterceptor.class));
         expected.add(this.applicationContext.getBean(MetricsClientInterceptor.class));
         expected.add(this.applicationContext.getBean(ObservationGrpcClientInterceptor.class));
-        expected.add(this.applicationContext.getBean(DeadlineSetupClientInterceptor.class));
 
         final List<ClientInterceptor> actual = new ArrayList<>(this.registry.getClientInterceptors());
         assertThat(actual).containsExactlyInAnyOrderElementsOf(expected);