diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
index edea142084..8609a7e506 100644
--- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
+++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
@@ -444,8 +444,8 @@ class DefaultTbContext implements TbContext {
         return mainCtx.getExternalCallExecutorService();
     }
 
-    @Deprecated
     @Override
+    @Deprecated
     public ScriptEngine createJsScriptEngine(String script, String... argNames) {
         return new RuleNodeJsScriptEngine(getTenantId(), mainCtx.getJsInvokeService(), script, argNames);
     }
diff --git a/common/script/script-api/src/main/java/org/thingsboard/script/api/ScriptInvokeService.java b/common/script/script-api/src/main/java/org/thingsboard/script/api/ScriptInvokeService.java
index d5d05b0f93..c765554572 100644
--- a/common/script/script-api/src/main/java/org/thingsboard/script/api/ScriptInvokeService.java
+++ b/common/script/script-api/src/main/java/org/thingsboard/script/api/ScriptInvokeService.java
@@ -18,6 +18,7 @@ package org.thingsboard.script.api;
 import com.google.common.util.concurrent.ListenableFuture;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.script.ScriptLanguage;
 
 import java.util.UUID;
 
@@ -29,4 +30,6 @@ public interface ScriptInvokeService {
 
     ListenableFuture<Void> release(UUID scriptId);
 
+    ScriptLanguage getLanguage();
+
 }
diff --git a/common/script/script-api/src/main/java/org/thingsboard/script/api/js/JsInvokeService.java b/common/script/script-api/src/main/java/org/thingsboard/script/api/js/JsInvokeService.java
index e3f29bf64f..e6a64d8c64 100644
--- a/common/script/script-api/src/main/java/org/thingsboard/script/api/js/JsInvokeService.java
+++ b/common/script/script-api/src/main/java/org/thingsboard/script/api/js/JsInvokeService.java
@@ -16,6 +16,13 @@
 package org.thingsboard.script.api.js;
 
 import org.thingsboard.script.api.ScriptInvokeService;
+import org.thingsboard.server.common.data.script.ScriptLanguage;
 
 public interface JsInvokeService extends ScriptInvokeService {
+
+    @Override
+    default ScriptLanguage getLanguage() {
+        return ScriptLanguage.JS;
+    }
+
 }
diff --git a/common/script/script-api/src/main/java/org/thingsboard/script/api/mvel/MvelInvokeService.java b/common/script/script-api/src/main/java/org/thingsboard/script/api/mvel/MvelInvokeService.java
index 929f60c24a..cd5678018a 100644
--- a/common/script/script-api/src/main/java/org/thingsboard/script/api/mvel/MvelInvokeService.java
+++ b/common/script/script-api/src/main/java/org/thingsboard/script/api/mvel/MvelInvokeService.java
@@ -16,6 +16,13 @@
 package org.thingsboard.script.api.mvel;
 
 import org.thingsboard.script.api.ScriptInvokeService;
+import org.thingsboard.server.common.data.script.ScriptLanguage;
 
 public interface MvelInvokeService extends ScriptInvokeService {
+
+    @Override
+    default ScriptLanguage getLanguage() {
+        return ScriptLanguage.MVEL;
+    }
+
 }
diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java
index c7b6ba377e..116e59880e 100644
--- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java
+++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java
@@ -268,6 +268,7 @@ public interface TbContext {
      * <p> Use {@link #createScriptEngine} instead.
      *
      */
+    @Deprecated
     ScriptEngine createJsScriptEngine(String script, String... argNames);
 
     ScriptEngine createScriptEngine(ScriptLanguage scriptLang, String script, String... argNames);