diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 02227c078..f99568c1b 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -8,6 +8,7 @@
  - fixed #11218: LDAPS does not create users automatically
  - fixed #11205: DataTable borked in IE
  - fixed #11215: Los Angeles cannot be default timezone
+ - fixed #11220: Map asset badly broken
 
 7.8.4
  - Fixed a compatibility problem between WRE and new Spectre code.
diff --git a/lib/WebGUI/Asset/Wobject/Map.pm b/lib/WebGUI/Asset/Wobject/Map.pm
index 6db5861f0..d92ac69e5 100644
--- a/lib/WebGUI/Asset/Wobject/Map.pm
+++ b/lib/WebGUI/Asset/Wobject/Map.pm
@@ -468,8 +468,12 @@ ENDHTML
     # Select box to choose a map point
     tie my %selectPointOptions, 'Tie::IxHash', (
         ""      => '-- ' . $i18n->get('select a point'),
-        map { $_->{assetId} => $_->{title} } sort { $a->{title} cmp $b->{title} } @{$var->{mapPoints}},
     );
+    if ( $var->{mapPoints} ) {
+        for my $point ( sort { $a->{title} cmp $b->{title} } @{$var->{mapPoints}} ) {
+            $selectPointOptions{ $point->{assetId} } = $point->{title}; 
+        }
+    }
     $var->{ selectPoint }
         = WebGUI::Form::selectBox( $session, {
             extras      => q{onchange="WebGUI.Map.focusOn(this.options[this.selectedIndex].value);"},