diff --git a/sources/Controller/Base/Layout/ActivityPanelController.php b/sources/Controller/Base/Layout/ActivityPanelController.php
index f0cda3f5d..479452fac 100644
--- a/sources/Controller/Base/Layout/ActivityPanelController.php
+++ b/sources/Controller/Base/Layout/ActivityPanelController.php
@@ -116,7 +116,9 @@ class ActivityPanelController
 				'html_rendering' => $sEntryAsHtml,
 			];
 		}
-		
+		// Finalize inline images
+		InlineImage::FinalizeInlineImages($oObject);
+
 		// Invoke extensions after the update of the object from the activity form
 		/** @var \iApplicationUIExtension $oExtensionInstance */
 		foreach(MetaModel::EnumPlugins('iApplicationUIExtension') as $oExtensionInstance)
@@ -126,9 +128,6 @@ class ActivityPanelController
 
 		$oObject->DBWrite();
 
-		// Finalize inline images
-		InlineImage::FinalizeInlineImages($oObject);
-
 		return $aResults;
 	}