diff --git a/common/js/plugins/ckeditor/ckeditor/plugins/xe_component/plugin.js b/common/js/plugins/ckeditor/ckeditor/plugins/xe_component/plugin.js
index 9ce8f4847..69e6def32 100644
--- a/common/js/plugins/ckeditor/ckeditor/plugins/xe_component/plugin.js
+++ b/common/js/plugins/ckeditor/ckeditor/plugins/xe_component/plugin.js
@@ -41,7 +41,7 @@ CKEDITOR.plugins.add('xe_component', {
 			}
 
 			if(!element) element = evt.data.element;
-			if(!editor_component && element && element.is('img')) {
+			if(!editor_component && element && element.is('img') && typeof config.xe_component_arrays.image_link !== 'undefined') {
 				editor_component = 'image_link';
 			}
 
diff --git a/modules/editor/skins/ckeditor/editor.html b/modules/editor/skins/ckeditor/editor.html
index 1bd0437ca..b6e6b09ce 100644
--- a/modules/editor/skins/ckeditor/editor.html
+++ b/modules/editor/skins/ckeditor/editor.html
@@ -148,6 +148,8 @@ var auto_saved_msg = "{$lang->msg_auto_saved}";
 			{@ $xe_component = implode(',', $xe_component); }
 
 			settings.ckeconfig.xe_component_arrays = {{$xe_component}};
+		<!--@else-->
+			settings.ckeconfig.xe_component_arrays = {};
 		<!--@endif-->
 
 		<!--@if(!$enable_default_component)-->