diff --git a/javascript/HtmlEditorField.js b/javascript/HtmlEditorField.js
index 9fd1f8487..ad12b58e8 100644
--- a/javascript/HtmlEditorField.js
+++ b/javascript/HtmlEditorField.js
@@ -213,11 +213,12 @@ ss.editorWrappers.tinyMCE = (function() {
 		 *  {DOMElement}
 		 */
 		cleanLink: function(href, node) {
-			var cb = tinyMCE.settings['urlconverter_callback'];
+			var cb = tinyMCE.settings['urlconverter_callback'],
+			    cu = tinyMCE.settings['convert_urls'];
 			if(cb) href = eval(cb + "(href, node, true);");
 
-			// Turn into relative
-			if(href.match(new RegExp('^' + tinyMCE.settings['document_base_url'] + '(.*)$'))) {
+			// Turn into relative, if set in TinyMCE config
+			if(cu && href.match(new RegExp('^' + tinyMCE.settings['document_base_url'] + '(.*)$'))) {
 				href = RegExp.$1;
 			}