diff --git a/src/structure/components/com_sportsmanager/admin.php b/src/structure/components/com_sportsmanager/admin.php
index 20b3eff..a2cfd9d 100644
--- a/src/structure/components/com_sportsmanager/admin.php
+++ b/src/structure/components/com_sportsmanager/admin.php
@@ -7788,6 +7788,7 @@ function adminHalloffameMitglieder(): void
 		if ($halloffame->spielform == 1){
 			foreach ($rows as $row) {
 				$index_vereinid = "verein_id_" . $row->platz;
+				$index_teamid = "team_id_" . $row->platz;
 				$index_team = "teamname_" . $row->platz;
 				if (!isset($mitglieder[$row->jahr])) {
 					$mitglieder[$row->jahr] = new stdClass();
@@ -7799,6 +7800,14 @@ function adminHalloffameMitglieder(): void
 					$halloffame->platz2_zeigen = 1;
 				if ($row->platz == 3 && !empty($row->teamname))
 					$halloffame->platz3_zeigen = 1;
+				
+				//Suche team_id wenn keine verein_id vorhanden
+				if (empty($row->verein_id)){
+					$query = "SELECT team_id FROM #__sportsmanager_team WHERE teamname LIKE '$row->teamname%' ORDER BY team_id DESC LIMIT 1;"; 
+					$mitglieder[$row->jahr]->$index_teamid = loadResult($db, $query);
+				} else {
+					$mitglieder[$row->jahr]->$index_teamid = "";
+				}
 			}
 		}
 		if ($halloffame->spielform == 2 || $halloffame->spielform == 3){
diff --git a/src/structure/components/com_sportsmanager/sportsmanager.php b/src/structure/components/com_sportsmanager/sportsmanager.php
index d546d44..a43a0c6 100644
--- a/src/structure/components/com_sportsmanager/sportsmanager.php
+++ b/src/structure/components/com_sportsmanager/sportsmanager.php
@@ -4507,6 +4507,7 @@ function halloffameDetails($uebergabe_id = 0): void
 		if ($halloffame->spielform == 1){
 			foreach ($rows as $row) {
 				$index_vereinid = "verein_id_" . $row->platz;
+				$index_teamid = "team_id_" . $row->platz;
 				$index_team = "teamname_" . $row->platz;
 				if (!isset($mitglieder[$row->jahr])) {
 					$mitglieder[$row->jahr] = new stdClass();
@@ -4518,6 +4519,14 @@ function halloffameDetails($uebergabe_id = 0): void
 					$halloffame->platz2_zeigen = 1;
 				if ($row->platz == 3 && !empty($row->teamname))
 					$halloffame->platz3_zeigen = 1;
+
+				//Suche team_id wenn keine verein_id vorhanden
+				if (empty($row->verein_id)){
+					$query = "SELECT team_id FROM #__sportsmanager_team WHERE teamname LIKE '$row->teamname%' ORDER BY team_id DESC LIMIT 1;"; 
+					$mitglieder[$row->jahr]->$index_teamid = loadResult($db, $query);
+				} else {
+					$mitglieder[$row->jahr]->$index_teamid = "";
+				}
 			}
 		}
 		if ($halloffame->spielform == 2 || $halloffame->spielform == 3){
diff --git a/src/structure/components/com_sportsmanager/views/sportsmanager/view.html.php b/src/structure/components/com_sportsmanager/views/sportsmanager/view.html.php
index cc0c190..b6f7e60 100644
--- a/src/structure/components/com_sportsmanager/views/sportsmanager/view.html.php
+++ b/src/structure/components/com_sportsmanager/views/sportsmanager/view.html.php
@@ -4291,7 +4291,6 @@ static function halloffameDetails($titel, $beschreibung, $rows, $halloffame): vo
 			<?php
 			} else {
 			?>
-
 			<tr class="<?php echo $rowclass; ?>">
 				<td nowrap style="text-align:center;">
 					<?php echo $row->jahr; ?>
@@ -4303,6 +4302,10 @@ static function halloffameDetails($titel, $beschreibung, $rows, $halloffame): vo
 						$id  = "verein_id_" . $i;
 						$txt = "teamname_" . $i;
 						$type = "vereine";
+						if ($row->$id == ""){
+							$id  = "team_id_" . $i;
+							$type = "mannschaften";
+						}
 					} else {
 						$id  = "spieler1_id_" . $i;
 						$txt = "spieler1_" . $i;
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 ea65d5a..8cf2604 100644
--- a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php
+++ b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php
@@ -8228,9 +8228,13 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
 						if ($i == 2 && !$halloffame->platz2_zeigen) continue;
 						if ($i == 3 && !$halloffame->platz3_zeigen) continue;
 						if ($halloffame->spielform == 1) {
-							$id  = "verein_id_" . $i;
 							$txt = "teamname_" . $i;
+							$id  = "verein_id_" . $i;
 							$type = "vereine";
+							if ($row->$id == ""){
+								$id  = "team_id_" . $i;
+								$type = "mannschaften";
+							}
 						} else {
 							$id  = "spieler1_id_" . $i;
 							$txt = "spieler1_" . $i;