diff --git a/mod/lti/amd/build/contentitem_return.min.js b/mod/lti/amd/build/contentitem_return.min.js
index ef56c529454..2903b144808 100644
--- a/mod/lti/amd/build/contentitem_return.min.js
+++ b/mod/lti/amd/build/contentitem_return.min.js
@@ -1 +1 @@
-define(["jquery"],function(a){return{init:function(b){a(window).ready(function(){window!=top&&parent.processContentItemReturnData(b)})}}});
\ No newline at end of file
+define(["jquery"],function(a){return{init:function(b){a(window).ready(function(){window!=top?parent.processContentItemReturnData(b):window.processContentItemReturnData(b)})}}});
\ No newline at end of file
diff --git a/mod/lti/amd/src/contentitem_return.js b/mod/lti/amd/src/contentitem_return.js
index 37d7c37de93..ee7ffd77df7 100644
--- a/mod/lti/amd/src/contentitem_return.js
+++ b/mod/lti/amd/src/contentitem_return.js
@@ -36,6 +36,8 @@ define(['jquery'], function($) {
                 if (window != top) {
                     // Send return data to be processed by the parent window.
                     parent.processContentItemReturnData(returnData);
+                } else {
+                    window.processContentItemReturnData(returnData);
                 }
             });
         }
diff --git a/mod/lti/return.php b/mod/lti/return.php
index 31d4da9564e..3004702cf23 100644
--- a/mod/lti/return.php
+++ b/mod/lti/return.php
@@ -119,6 +119,8 @@ if (!empty($errormsg)) {
             //<![CDATA[
                 if(window != top){
                     top.location.href = '{$url}';
+                } else {
+                    window.location.href = '{$url}';
                 }
             //]]
             </script>