diff --git a/media.module b/media.module
index 206ce4c..db44895 100644
--- a/media.module
+++ b/media.module
@@ -1316,3 +1316,17 @@ function _media_get_migratable_file_types() {
 
   return array_diff($types, $enabled_types);
 }
+
+/**
+ * Implements hook_wysiwyg_editor_settings_alter().
+ *
+ * Temporary fix to make the media wysiwyg integration working for CKEditor 4.
+ *
+ * @link https://drupal.org/node/1951964
+ */
+function media_wysiwyg_editor_settings_alter(&$settings, $context) {
+  if ($context['profile']->editor == 'ckeditor') {
+    $settings['allowedContent'] = TRUE;
+  }
+}
+