diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index 739285e64..72900d873 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -796,7 +796,7 @@ class ApiController extends Zend_Controller_Action
         $request = $this->getRequest();
 
         $component = $request->getParam('component');
-        $remoteAddr = $_SERVER['REMOTE_ADDR'];
+        $remoteAddr = Application_Model_ServiceRegister::GetRemoteIpAddr();
         Logging::log("Registered Component: ".$component."@".$remoteAddr);
 
         Application_Model_ServiceRegister::Register($component, $remoteAddr);
diff --git a/airtime_mvc/application/models/ServiceRegister.php b/airtime_mvc/application/models/ServiceRegister.php
index 47c647829..0f793e93a 100644
--- a/airtime_mvc/application/models/ServiceRegister.php
+++ b/airtime_mvc/application/models/ServiceRegister.php
@@ -1,6 +1,20 @@
 <?php
 class Application_Model_ServiceRegister {
 
+    public static function GetRemoteIpAddr(){
+
+        if (!empty($_SERVER['HTTP_CLIENT_IP'])){
+            //check ip from share internet
+            $ip=$_SERVER['HTTP_CLIENT_IP'];
+        }elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])){
+            //to check ip is pass from proxy
+            $ip=$_SERVER['HTTP_X_FORWARDED_FOR'];
+        }else{
+            $ip=$_SERVER['REMOTE_ADDR'];
+        }
+        return $ip;
+    }
+
     public static function Register($p_componentName, $p_ipAddress){
 
         $component = CcServiceRegisterQuery::create()->findOneByDbName($p_componentName);