diff --git a/templates/dates/_seminar_rooms.php b/templates/dates/_seminar_rooms.php
index c10fa453e4447f67cdc1823cc1389ab632be6905..543044ad5bb7ac2fdba0d281e32fc2d42a24205d 100644
--- a/templates/dates/_seminar_rooms.php
+++ b/templates/dates/_seminar_rooms.php
@@ -7,7 +7,7 @@ $prefix     = $prefix ?? ', ';
 $hide_empty = $hide_empty ?? false;
 $limit      = $limit ?? 3;
 $assigned   = $assigned ?: [];
-$freetext   = $freetext ?: [];
+$freetext   = $freetext ?? [];
 $plain      = $plain ?? false;
 
 if ($assigned || $freetext) {
diff --git a/templates/dates/seminar_html.php b/templates/dates/seminar_html.php
index 1f55dbfbbb452ac4f94fd54c1c601de07cb3ca12..ce84efdbbb26749e14676f9acd80681c1e7ac30e 100644
--- a/templates/dates/seminar_html.php
+++ b/templates/dates/seminar_html.php
@@ -47,15 +47,19 @@ if (!$dates['regular']['turnus_data'] && empty($dates['irregular'])) {
 
     if (isset($dates['irregular']) && is_array($dates['irregular'])) {
         foreach ($dates['irregular'] as $date) {
-            if (!isset($irregular_rooms[$date['resource_id']])) {
-                $irregular_rooms[$date['resource_id']] = 0;
-            }
             $irregular[] = $date;
             $irregular_strings[] = $date['tostring'];
             if ($date['resource_id']) {
+                if (!isset($irregular_rooms[$date['resource_id']])) {
+                    $irregular_rooms[$date['resource_id']] = 0;
+                }
                 $irregular_rooms[$date['resource_id']]++;
             } elseif ($date['raum']) {
-                $freetext_rooms['(' . htmlReady($date['raum']) . ')']++;
+                $temp = '(' . htmlReady($date['raum']) . ')';
+                if (!isset($freetext_rooms[$temp])) {
+                    $irregular_rooms[$temp] = 0;
+                }
+                $freetext_rooms[$temp]++;
             }
         }
         // Remove invalid entry if present