diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/templates/eureka/lastn.ftl b/spring-cloud-netflix-eureka-server/src/main/resources/templates/eureka/lastn.ftl
index a9fdfcbc..41cbef00 100644
--- a/spring-cloud-netflix-eureka-server/src/main/resources/templates/eureka/lastn.ftl
+++ b/spring-cloud-netflix-eureka-server/src/main/resources/templates/eureka/lastn.ftl
@@ -5,7 +5,7 @@
Eureka - Last N events
-
+
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/templates/eureka/navbar.ftl b/spring-cloud-netflix-eureka-server/src/main/resources/templates/eureka/navbar.ftl
index b1bd2b48..d7d58640 100644
--- a/spring-cloud-netflix-eureka-server/src/main/resources/templates/eureka/navbar.ftl
+++ b/spring-cloud-netflix-eureka-server/src/main/resources/templates/eureka/navbar.ftl
@@ -5,15 +5,15 @@
<#if amazonInfo??>
| EUREKA SERVER |
- AMI: ${amiId} |
+ AMI: ${amiId!} |
| Zone |
- ${availabilityZone} |
+ ${availabilityZone!} |
| instance-id |
- ${instanceId} |
+ ${instanceId!} |