diff --git a/var/www/modules/settings/templates/settings_index.html b/var/www/modules/settings/templates/settings_index.html
index b6a3fdf7..4dbdce42 100644
--- a/var/www/modules/settings/templates/settings_index.html
+++ b/var/www/modules/settings/templates/settings_index.html
@@ -43,7 +43,11 @@
                       <tbody>
                         <tr>
                           <td>AIL Version</td>
+                          {%if ail_version is not none %}
                           <td>{{current_version}}<a target="_blank" href="https://github.com/ail-project/ail-framework/releases/tag/{{current_version}}" class="text-info"><small> (release note)</small></a></td>
+			  {%else%}
+                          <td>{{git_metadata['current_branch']}}</td>
+                          {%endif%}
                         </tr>
                         <tr
                         {%if git_metadata['current_branch'] != 'master'%}
diff --git a/var/www/templates/settings/settings_index.html b/var/www/templates/settings/settings_index.html
index dbdd6843..63a92d55 100644
--- a/var/www/templates/settings/settings_index.html
+++ b/var/www/templates/settings/settings_index.html
@@ -43,7 +43,11 @@
                       <tbody>
                         <tr>
                           <td>AIL Version</td>
+                          {%if ail_version is not none %}
                           <td>{{ail_version}}<a target="_blank" href="https://github.com/ail-project/ail-framework/releases/tag/{{ail_version}}" class="text-info"><small> (release note)</small></a></td>
+			  {%else%}
+                          <td>{{git_metadata['current_branch']}}</td>
+                          {%endif%}
                         </tr>
                         <tr
                         {%if git_metadata['current_branch'] != 'master'%}