diff --git a/src/node/handler/ImportHandler.js b/src/node/handler/ImportHandler.js
index 23f238337..6ea76cac3 100644
--- a/src/node/handler/ImportHandler.js
+++ b/src/node/handler/ImportHandler.js
@@ -286,15 +286,6 @@ exports.doImport = function (req, res, padId)
     }
   }).then(() => {
     // close the connection
-    res.send(
-    "<head> \
-      <script type='text/javascript' src='../../static/js/jquery.js'></script> \
-    </head> \
-    <script> \
-      $(window).load(function(){ \
-        var impexp = window.parent.padimpexp.handleFrameCall('" + req.directDatabaseAccess +"', '" + status + "'); \
-      }) \
-    </script>"
-    );
+    res.send("<script>document.addEventListener('DOMContentLoaded', function(){ var impexp = window.parent.padimpexp.handleFrameCall('" + req.directDatabaseAccess +"', '" + status + "'); })</script>");
   });
 }
diff --git a/src/static/js/pad_impexp.js b/src/static/js/pad_impexp.js
index ac4982102..9c6404d4a 100644
--- a/src/static/js/pad_impexp.js
+++ b/src/static/js/pad_impexp.js
@@ -244,6 +244,7 @@ var padimpexp = (function()
     },
     handleFrameCall: function(directDatabaseAccess, status)
     {
+      if(directDatabaseAccess === "undefined") directDatabaseAccess = false;
       if (status !== "ok")
       {
         importFailed(status);
