diff --git a/forms/HtmlEditorField.php b/forms/HtmlEditorField.php
index 15df12fef..12f864640 100755
--- a/forms/HtmlEditorField.php
+++ b/forms/HtmlEditorField.php
@@ -54,6 +54,8 @@ class HtmlEditorField extends TextareaField {
 				} else if($link[0] == '/') {
 					$broken = true;
 				} else if(ereg('^assets/',$link)) {
+					$link = str_replace(array('%20', '%5C', '%27'), array(' ', '\\', '\''), $link);
+					$link = Convert::raw2sql($link);
 					if(!DataObject::get_one("File", "Filename = '$link'", false)) {
 						$broken = true;
 					}