diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 07f33f3dbd..73a86748c8 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -275,6 +275,7 @@ p a {
 		<li>[Feature] Make effect of a changed hideonline permission instantaneous</li>
 		<li>[Fix] Do not overwrite larger memory values in the installer (Bug #12195)</li>
 		<li>[Fix] Order forums on role permission mask (Bug #12337)</li>
+		<li>[Fix] Show "no image" image when a non-selectable item was selected in the acp imageset editor - IE (Bug #12423)</li>
 
 </ul>
 
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 5f3aa024fc..2d175b53b1 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -1452,7 +1452,8 @@ parse_css_file = {PARSE_CSS_FILE}
 			'IMAGE_OPTIONS'		=> $img_options,
 			'IMAGE_SIZE'		=> $image_width,
 			'IMAGE_HEIGHT'		=> $image_height,
-			'IMAGE_REQUEST'		=> $image_request,
+			'IMAGE_REQUEST'		=> (empty($image_filename)) ? 'images/no_image.png' : $image_request,
+			'TEST'				=> (empty($image_filename)) ? 'test' : 'tast',
 			'U_ACTION'			=> $this->u_action . "&amp;action=edit&amp;id=$imageset_id",
 			'U_BACK'			=> $this->u_action,
 			'NAME'				=> $imageset_name,