diff --git a/Configuration/Sets/Maps2/settings.definitions.yaml b/Configuration/Sets/Maps2/settings.definitions.yaml
index aacc130a9..fd3f10ed4 100644
--- a/Configuration/Sets/Maps2/settings.definitions.yaml
+++ b/Configuration/Sets/Maps2/settings.definitions.yaml
@@ -35,7 +35,7 @@ settings:
     category: 'Maps2.templates.infoWindowContent'
     description: 'If you click on a marker (POI) a little info window will appear. With this setting you can change the template to your own needs.'
     type: string
-    default: 'EXT:maps2/Resources/Private/Templates/InfoWindowContent.html'
+    default: 'EXT:maps2/Resources/Private/Templates/InfoWindowContent.fluid.html'
   maps2.infoWindowContent.imageHeight:
     label: 'Image Height'
     category: 'Maps2.templates.infoWindowContent'
diff --git a/Documentation/ChangeLog/Index.rst b/Documentation/ChangeLog/Index.rst
index 5ada5262d..24843b81b 100644
--- a/Documentation/ChangeLog/Index.rst
+++ b/Documentation/ChangeLog/Index.rst
@@ -7,6 +7,15 @@
 ChangeLog
 =========
 
+Version 13.1.1
+==============
+
+*   BUGFIX: Point the default info window template setting to the existing
+    `InfoWindowContent.fluid.html` template
+*   BUGFIX: Render info window content with `f:format.html`. `f:transform.html`
+    requires `$GLOBALS['TYPO3_REQUEST']`, which the info window middleware does
+    not set
+
 Version 13.1.0
 ==============
 
diff --git a/Documentation/Configuration/Extension/Index.rst b/Documentation/Configuration/Extension/Index.rst
index aeb3fed70..02ecfc4f5 100644
--- a/Documentation/Configuration/Extension/Index.rst
+++ b/Documentation/Configuration/Extension/Index.rst
@@ -132,7 +132,7 @@ activation of Google Maps for current browser session.
 infoWindowContentTemplatePath
 -----------------------------
 
-Default: `EXT:maps2/Resources/Private/Templates/InfoWindowContent.html`
+Default: `EXT:maps2/Resources/Private/Templates/InfoWindowContent.fluid.html`
 
 You can define your own default template for the info window content when
 clicking on a marker. Further you can override this template path again with
diff --git a/Resources/Private/Partials/InfoWindowContent.fluid.html b/Resources/Private/Partials/InfoWindowContent.fluid.html
index 468b6c24a..ef64c615a 100644
--- a/Resources/Private/Partials/InfoWindowContent.fluid.html
+++ b/Resources/Private/Partials/InfoWindowContent.fluid.html
@@ -32,6 +32,6 @@
 
 <f:if condition="{poiCollection.info_window_content}">
     <br/>
-    <div class="infoWindowContent">{poiCollection.info_window_content -> f:transform.html()}</div>
+    <div class="infoWindowContent">{poiCollection.info_window_content -> f:format.html()}</div>
 </f:if>
 </html>
diff --git a/Tests/Unit/Configuration/SiteSetSettingsTest.php b/Tests/Unit/Configuration/SiteSetSettingsTest.php
new file mode 100644
index 000000000..e0ffa52b0
--- /dev/null
+++ b/Tests/Unit/Configuration/SiteSetSettingsTest.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the package jweiland/maps2.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE file that was distributed with this source code.
+ */
+
+namespace JWeiland\Maps2\Tests\Unit\Configuration;
+
+use PHPUnit\Framework\Attributes\Test;
+use Symfony\Component\Yaml\Yaml;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
+
+/**
+ * Class SiteSetSettingsTest
+ */
+class SiteSetSettingsTest extends UnitTestCase
+{
+    #[Test]
+    public function defaultInfoWindowContentTemplateExists(): void
+    {
+        $extensionPath = dirname(__DIR__, 3) . '/';
+        $definitions = Yaml::parseFile($extensionPath . 'Configuration/Sets/Maps2/settings.definitions.yaml');
+        $templatePath = $definitions['settings']['maps2.infoWindowContent.templatePath']['default'];
+
+        self::assertStringStartsWith('EXT:maps2/', $templatePath);
+        self::assertFileExists($extensionPath . substr($templatePath, strlen('EXT:maps2/')));
+    }
+}