diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index a5731972157..078197d1e88 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -9,6 +9,7 @@ var data = require('web.data');
 var form_common = require('web.form_common');
 var Pager = require('web.Pager');
 var View = require('web.View');
+var ajax = require('web.ajax');
 
 var _t = core._t;
 var _lt = core._lt;
@@ -33,7 +34,15 @@ var DiagramView = View.extend({
     },
 
     view_loading: function(r) {
-        return this.load_diagram(r);
+        if (window.Raphael) {
+            return this.load_diagram(r);
+        }
+        var self = this;
+        return $.when(
+            ajax.loadJS('/web_diagram/static/lib/js/jquery.mousewheel.js'),
+            ajax.loadJS('/web_diagram/static/lib/js/raphael.js')).then(function () {
+                return self.load_diagram(r);
+            });
     },
 
     toTitleCase: function(str) {
diff --git a/addons/web_diagram/views/web_diagram.xml b/addons/web_diagram/views/web_diagram.xml
index 6bb89cb1ee0..c8606506c53 100644
--- a/addons/web_diagram/views/web_diagram.xml
+++ b/addons/web_diagram/views/web_diagram.xml
@@ -4,16 +4,10 @@
         <template id="assets_backend" name="web_diagram assets" inherit_id="web.assets_backend">
             <xpath expr="." position="inside">
                 <link rel="stylesheet" href="/web_diagram/static/src/less/diagram_view.less"/>
-
-                <script type="text/javascript" src="/web_diagram/static/lib/js/jquery.mousewheel.js"></script>
-                <script type="text/javascript" src="/web_diagram/static/lib/js/raphael.js"></script>
-
                 <script type="text/javascript" src="/web_diagram/static/src/js/vec2.js"></script>
                 <script type="text/javascript" src="/web_diagram/static/src/js/graph.js"></script>
                 <script type="text/javascript" src="/web_diagram/static/src/js/diagram.js"></script>
             </xpath>
         </template>
-        <template id="assets_raphael" name="raphael.js">
-        </template>
     </data>
 </openerp>