diff --git a/filter.php b/filter.php
index 8f6e253de868c570ddc19f255e22c8a73e4f898d..a1e68c0d3896af785635d9a6640e7159cf6ff869 100644
--- a/filter.php
+++ b/filter.php
@@ -72,8 +72,12 @@ class filter_opencast extends moodle_text_filter {
                 } else if ($video) {
                     $video = false;
                     if (substr($match, 0, 7) === "<source") {
-                        // Get baseurl.
+
+                        // Get baseurl either from engageurl setting or from opencast tool.
                         $baseurl = get_config('filter_opencast', 'engageurl');
+                        if (empty($baseurl)) {
+                            $baseurl = get_config('tool_opencast', 'apiurl');
+                        }
 
                         // Check if video is from opencast.
                         if (strpos($match, $baseurl) === false) {
diff --git a/lib.php b/lib.php
index 7af946cf5e9f4e36218745a993787f7ba9717ba9..9250ca51f16259224941cdc4a19ef0db1a75a952 100644
--- a/lib.php
+++ b/lib.php
@@ -32,8 +32,12 @@ require_once($CFG->dirroot . '/lib/oauthlib.php');
 function filter_opencast_login() {
     global $PAGE;
 
-    // Get url of opencast engage server.
+    // Get baseurl for the endpoint either from engageurl setting or from opencast tool.
     $endpoint = get_config('filter_opencast', 'engageurl');
+    if (empty($endpoint)) {
+        $endpoint = get_config('tool_opencast', 'apiurl');
+    }
+
     if (strpos($endpoint, 'http') !== 0) {
         $endpoint = 'http://' . $endpoint;
     }