diff --git a/apps/workflowengine/lib/Helper/LogContext.php b/apps/workflowengine/lib/Helper/LogContext.php
index 786aa7cf85ab0f4e0de6466b9b5df7defc1e1b2a..548e8722073552dcad73d50d10fa9e640c12f015 100644
--- a/apps/workflowengine/lib/Helper/LogContext.php
+++ b/apps/workflowengine/lib/Helper/LogContext.php
@@ -33,7 +33,7 @@ class LogContext {
 	protected $details;
 
 	public function setDescription(string $description): LogContext {
-		$this->details['description'] = $description;
+		$this->details['message'] = $description;
 		return $this;
 	}
 
diff --git a/apps/workflowengine/lib/Service/Logger.php b/apps/workflowengine/lib/Service/Logger.php
index 0bf09ed8a72df67555c7bf7f3f7707e2a0a0341e..8b90e6fa159d0fe3d1199412bc2a666db5415a1d 100644
--- a/apps/workflowengine/lib/Service/Logger.php
+++ b/apps/workflowengine/lib/Service/Logger.php
@@ -162,8 +162,10 @@ class Logger {
 			return;
 		}
 
+		$details = $logContext->getDetails();
 		$this->flowLogger->logData(
-			$logContext->getDetails(),
+			$details['message'],
+			$details,
 			['app' => Application::APP_ID, 'level' => $context['level']]
 		);
 	}
diff --git a/lib/private/Log.php b/lib/private/Log.php
index 8d51a673a4603728364e0c4dc0154cbb547fb155..d288e7241795a48cd1172664ec0a860f062af1fc 100644
--- a/lib/private/Log.php
+++ b/lib/private/Log.php
@@ -340,7 +340,7 @@ class Log implements ILogger, IDataLogger {
 		}
 	}
 
-	public function logData(array $data, array $context = []): void {
+	public function logData(string $message, array $data, array $context = []): void {
 		$app = $context['app'] ?? 'no app in context';
 		$level = $context['level'] ?? ILogger::ERROR;
 
@@ -350,6 +350,7 @@ class Log implements ILogger, IDataLogger {
 
 		try {
 			if ($level >= $minLevel) {
+				$data['message'] = $message;
 				if (!$this->logger instanceof IFileBased) {
 					$data = json_encode($data, JSON_PARTIAL_OUTPUT_ON_ERROR | JSON_UNESCAPED_SLASHES);
 				}
diff --git a/lib/private/Log/LogDetails.php b/lib/private/Log/LogDetails.php
index 2eea17ad73dd610b60b7aebc2d47038743be99e7..b1dc6e4311ba9bef1281e14aa2167535c6d947bf 100644
--- a/lib/private/Log/LogDetails.php
+++ b/lib/private/Log/LogDetails.php
@@ -80,6 +80,16 @@ abstract class LogDetails {
 			'userAgent',
 			'version'
 		);
+
+		if(is_array($message) && !array_key_exists('Exception', $message)) {
+			// Exception messages should stay as they are,
+			// anything else modern is split to 'message' (string) and
+			// data (array) fields
+			$shortMessage = $message['message'] ?? '(no message provided)';
+			$entry['data'] = $message;
+			$entry['message'] = $shortMessage;
+		}
+
 		return $entry;
 	}
 
diff --git a/lib/public/Log/IDataLogger.php b/lib/public/Log/IDataLogger.php
index 895ba43f5ca1e2c9a05d877ba1a8b8d7e4432def..b5d3aa3075b148655b589fd5a1ff3f67af72f914 100644
--- a/lib/public/Log/IDataLogger.php
+++ b/lib/public/Log/IDataLogger.php
@@ -28,15 +28,15 @@ namespace OCP\Log;
  * Interface IDataLogger
  *
  * @package OCP\Log
- * @since 18.0.0
+ * @since 18.0.1
  */
 interface IDataLogger {
 
 	/**
 	 * allows to log custom data, similar to how logException works
 	 *
-	 * @since 18.0.0
+	 * @since 18.0.1
 	 */
-	public function logData(array $data, array $context = []): void;
+	public function logData(string $message, array $data, array $context = []): void;
 
 }