diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.service-invoker-utility/public/js/invoker-lib.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.service-invoker-utility/public/js/invoker-lib.js
index 30f2be1c64e..a63dcbd5b0a 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.service-invoker-utility/public/js/invoker-lib.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.service-invoker-utility/public/js/invoker-lib.js
@@ -26,10 +26,9 @@ var invokerUtil = function () {
         restAPIRequestDetails["requestMethod"] = requestMethod;
         restAPIRequestDetails["requestURL"] = requestURL;
         restAPIRequestDetails["requestPayload"] = JSON.stringify(requestPayload);
-        var appContext = devicemgtProps["appContext"];
 
         var request = {
-            url: appContext + "api/invoker/execute/",
+            url: context + "/api/invoker/execute/",
             type: "POST",
             contentType: "application/json",
             data: JSON.stringify(restAPIRequestDetails),
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.service-invoker-utility/service-invoker-utility.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.service-invoker-utility/service-invoker-utility.hbs
index 16595376577..af0fa53631b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.service-invoker-utility/service-invoker-utility.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.service-invoker-utility/service-invoker-utility.hbs
@@ -15,10 +15,7 @@
   specific language governing permissions and limitations
   under the License.
 }}
-{{#zone "bottomJs"}}
-    {{js "js/js.cookie.js"}}
-    {{js "js/invoker-lib.js"}}
-
+{{#zone "content"}}
     <div id="error-msg" class="hide">
         <div class="content">
             <div class="row">
@@ -34,4 +31,11 @@
             </div>
         </div>
     </div>
-{{/zone}}
\ No newline at end of file
+{{/zone}}
+{{#zone "bottomJs"}}
+    <script type="text/javascript">
+        var context = "{{@app.context}}"
+    </script>
+    {{js "js/js.cookie.js"}}
+    {{js "js/invoker-lib.js"}}
+{{/zone}}