diff --git a/Classes/Extension/Typo3Image.php b/Classes/Extension/Typo3Image.php
index 5592e756806b87e3be59344539053fc07c842be6..e68fe4d2db19881637a3dc48da556a9624439df5 100644
--- a/Classes/Extension/Typo3Image.php
+++ b/Classes/Extension/Typo3Image.php
@@ -14,9 +14,9 @@ namespace SGalinski\Tinymce4Rte\Extension;
  * The TYPO3 project - inspiring people to share!
  */
 
+use SGalinski\Tinymce4Rte\RteHtmlAreaApi;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi;
 
 /**
  * TYPO3 Image plugin for htmlArea RTE
diff --git a/Classes/Form/Element/RichTextElement.php b/Classes/Form/Element/RichTextElement.php
index 182b20f240442ab3d9b04870e1f577d50da3494a..3da2cbbd34edf0e568708329aa6a0e9d758bcfa5 100644
--- a/Classes/Form/Element/RichTextElement.php
+++ b/Classes/Form/Element/RichTextElement.php
@@ -361,9 +361,9 @@ class RichTextElement extends AbstractFormElement {
 	protected function enableRegisteredPlugins() {
 		// @todo repair this
 		$plugins = [
-//			'TYPO3Image' => [
-//				'objectReference' => Typo3Image::class,
-//			],
+			'TYPO3Image' => [
+				'objectReference' => Typo3Image::class,
+			],
 			'TYPO3Link' => [
 				'objectReference' => TYPO3Link::class,
 			],