diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignAutoConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignAutoConfiguration.java
index c718b522..4b93a325 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignAutoConfiguration.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignAutoConfiguration.java
@@ -1,8 +1,10 @@
 package org.springframework.cloud.netflix.feign;
 
 import feign.Contract;
+import feign.Feign;
 import feign.Logger;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration;
@@ -11,6 +13,7 @@ import org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration;
  * @author Spencer Gibb
  */
 @Configuration
+@ConditionalOnClass(Feign.class)
 @AutoConfigureAfter(ArchaiusAutoConfiguration.class)
 public class FeignAutoConfiguration {
     @Bean