diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/MessageFeignClient.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/MessageFeignClient.java
similarity index 91%
rename from epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/MessageFeignClient.java
rename to epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/MessageFeignClient.java
index 82a9516e7a..cfa79bf8cc 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/MessageFeignClient.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/MessageFeignClient.java
@@ -8,7 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = MessageFeignClientFallback.class, url = "http://localhost:8085")
+@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = MessageFeignClientFallback.class)
 public interface MessageFeignClient {
 
     /**
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java
similarity index 100%
rename from epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java
rename to epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java