diff --git a/views/lot-view.ejs b/views/lot-view.ejs
index e0a4ae37..c1eaa110 100644
--- a/views/lot-view.ejs
+++ b/views/lot-view.ejs
@@ -37,7 +37,7 @@
                 <div>
                     <strong><%= configFunctions.getProperty("aliases.map") %></strong><br />
                     <a href="<%= urlPrefix %>/maps/<%= lot.mapId %>">
-                        <%= lot.mapName %>
+                        <%= lot.mapName || "(No Name)" %>
                     </a>
                 </div>
                 <div class="mt-2">
diff --git a/views/map-edit.ejs b/views/map-edit.ejs
index 50a3fe3d..b6b8cba5 100644
--- a/views/map-edit.ejs
+++ b/views/map-edit.ejs
@@ -13,7 +13,7 @@
                     </a>
                 </li>
                 <% if (!isCreate) { %>
-                    <li><a href="<%= urlPrefix %>/maps/<%= map.mapId %>"><%= map.mapName %></a></li>
+                    <li><a href="<%= urlPrefix %>/maps/<%= map.mapId %>"><%= map.mapName || "(No Name)" %></a></li>
                 <% } %>
                 <li class="is-active">
                     <a href="#" aria-current="page">
diff --git a/views/map-view.ejs b/views/map-view.ejs
index 877a4bb1..726eaa6d 100644
--- a/views/map-view.ejs
+++ b/views/map-view.ejs
@@ -14,14 +14,14 @@
                 </li>
                 <li class="is-active">
                     <a href="#" aria-current="page">
-                        <%= map.mapName %>
+                        <%= map.mapName || "(No Name)" %>
                     </a>
                 </li>
             </ul>
         </nav>
 
         <h1 class="title is-1">
-            <%= map.mapName %>
+            <%= map.mapName || "(No Name)" %>
         </h1>
 
         <% if (user.userProperties.canUpdate) { %>