diff --git a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php
index 690e996..5fa2833 100644
--- a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php
+++ b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php
@@ -10325,14 +10325,14 @@ class HTML_sportsmanager_admin
                                                 :</label>
                                         </td>
                                         <td nowrap>
-											<?php if ($neuer_eintrag) {$row->spiel_nr = "";} ?>
+											<?php $spiel_nr = ($neuer_eintrag || $row == null) ? null : ($row->spiel_nr ?? null); ?>
                                             <select class="uk-select uk-form-width-xsmall" id="game_nr" size="1"
 													title="Spielnummer (optional)" name="spiel_nr">
 											<option value=""></option>
                                                 <?php
                                                 for ($i = 1; $i <= 99; $i++) 
 												{
-													echo "<option value=\"" . $i . "\"" . ($row->spiel_nr == $i ? " selected" : "") . ">" . $i . "</option>";
+													echo "<option value=\"" . $i . "\"" . ($spiel_nr == $i ? " selected" : "") . ">" . $i . "</option>";
 												}
                                                 ?>
 											</select>