diff --git a/caimira/apps/calculator/__init__.py b/caimira/apps/calculator/__init__.py
index f5ae5b91..3a61cd79 100644
--- a/caimira/apps/calculator/__init__.py
+++ b/caimira/apps/calculator/__init__.py
@@ -334,6 +334,8 @@ class CasesData(BaseRequestHandler):
         current_date = str(datetime.datetime.now()).split(' ')[0]
         eight_days_ago = str(datetime.datetime.now() - datetime.timedelta(days=7)).split(' ')[0]
         cases = cases.set_index(['Date_reported'])
+        # If any of the 'New_cases' is 0, it means the data is not updated.
+        if (cases.loc[eight_days_ago:current_date]['New_cases'] == 0).any(): return self.finish('')
         return self.finish(str(round(cases.loc[eight_days_ago:current_date]['New_cases'].mean())))
 
 
diff --git a/caimira/apps/calculator/static/js/form.js b/caimira/apps/calculator/static/js/form.js
index 300f54ce..48bca724 100644
--- a/caimira/apps/calculator/static/js/form.js
+++ b/caimira/apps/calculator/static/js/form.js
@@ -424,6 +424,7 @@ function geographic_cases(location_country_name) {
     type: 'GET',
     success: function (result) {
       $('#geographic_cases').val(result);
+      result != '' ? $('#source_geographic_cases').show() : $('#source_geographic_cases').hide();
     },
     error: function(_, _, errorThrown) {
       console.log(errorThrown);
diff --git a/caimira/apps/templates/base/calculator.form.html.j2 b/caimira/apps/templates/base/calculator.form.html.j2
index 711736bd..de520fa2 100644
--- a/caimira/apps/templates/base/calculator.form.html.j2
+++ b/caimira/apps/templates/base/calculator.form.html.j2
@@ -387,9 +387,9 @@
       </div>
       <div class="form-group row">
         <div class="col-sm-4"><label class="col-form-label pt-0">New confirmed cases (weekly):</label></div>
-        <div class="col-sm-6 pl-0 pt-1 align-self-center">
+        <div class="col-sm-6 pl-0 align-self-center">
           <input type="number" step="any" id="geographic_cases" class="non_zero form-control" name="geographic_cases" placeholder="Cases (#7-day rolling avg)" min="0">
-          <small class="form-text text-muted">
+          <small id="source_geographic_cases" class="form-text text-muted" style="display: none">
             Source: World Health Organization.
           </small>
         </div>