diff --git a/addons/website_links/static/src/js/website_links.js b/addons/website_links/static/src/js/website_links.js
index dd28ecfb437..7a2b12755a0 100644
--- a/addons/website_links/static/src/js/website_links.js
+++ b/addons/website_links/static/src/js/website_links.js
@@ -146,6 +146,12 @@ openerp.website.if_dom_contains('div.o_website_links_create_tracked_url', functi
             var init_code = this.$('#o_website_links_edit_code_form #init_code').val();
             var new_code = this.$('#o_website_links_edit_code_form #new_code').val();
 
+            if(new_code === '') {
+                self.$('.o_website_links_code_error').html("The code cannot be left empty");
+                self.$('.o_website_links_code_error').show();
+                return;
+            }
+
             function show_new_code(new_code) {
                 self.$('.o_website_links_code_error').html('');
                 self.$('.o_website_links_code_error').hide();
@@ -378,4 +384,4 @@ openerp.website.if_dom_contains('div.o_website_links_create_tracked_url', functi
         })
     });
 });
-})();
\ No newline at end of file
+})();
diff --git a/addons/website_links/static/src/js/website_links_code_editor.js b/addons/website_links/static/src/js/website_links_code_editor.js
index 62d4065e20b..3bc1500ead8 100644
--- a/addons/website_links/static/src/js/website_links_code_editor.js
+++ b/addons/website_links/static/src/js/website_links_code_editor.js
@@ -34,6 +34,12 @@ openerp.website.if_dom_contains('.o_website_links_edit_code', function() {
             var init_code = $('#edit-code-form #init_code').val();
             var new_code = $('#edit-code-form #new_code').val();
 
+            if(new_code === '') {
+                self.$('.o_website_links_code_error').html("The code cannot be left empty");
+                self.$('.o_website_links_code_error').show();
+                return;
+            }
+
             function show_new_code(new_code) {
                 $('.o_website_links_code_error').html('');
                 $('.o_website_links_code_error').hide();
@@ -80,4 +86,4 @@ openerp.website.if_dom_contains('.o_website_links_edit_code', function() {
     });
 });
 });
-})();
\ No newline at end of file
+})();