diff --git a/Classes/Content/ProductionExceptionHandler.php b/Classes/Content/ProductionExceptionHandler.php
index 387c2e5..b5986b6 100644
--- a/Classes/Content/ProductionExceptionHandler.php
+++ b/Classes/Content/ProductionExceptionHandler.php
@@ -28,7 +28,7 @@ public function handle(
         $errorMessage = parent::handle($exception, $contentObject, $contentObjectConfiguration);
         $eventId = GeneralUtility::makeInstance(Client::class)->captureException($exception);
 
-        if (ConfigurationService::showEventId()) {
+        if (ConfigurationService::showEventId() && ! empty($eventId)) {
             return sprintf('%s Event: %s', $errorMessage, $eventId);
         }
         return $errorMessage;