diff --git a/src/main/resources/templates/layout/sidebar.html b/src/main/resources/templates/layout/sidebar.html
index 0d6eaa3cf..28ca1b06e 100644
--- a/src/main/resources/templates/layout/sidebar.html
+++ b/src/main/resources/templates/layout/sidebar.html
@@ -32,9 +32,9 @@ <h4>Menu</h4>
         </div>
     </div>
     <div class="sidebar-footer">
-        <span><i class="fas fa-tag"></i> <span th:text="${info.build.version}"></span></span>
+        <span th:if="${info[build] != null}"><i class="fas fa-tag"></i> <span th:text="${info.build.version}"></span></span>
 
-        <span><i class="fab fa-github"></i> <span th:text="${info.git.commit.id}"></span></span>
+        <span th:if="${info[git] != null}"><i class="fab fa-github"></i> <span th:text="${info.git.commit.id}"></span></span>
     </div>
 </nav>
 <!-- end sidebar -->