diff --git a/templates/bootstrap/dashboard/js/api.tpl b/templates/bootstrap/dashboard/js/api.tpl
index ef989f3c..f81a1fe0 100644
--- a/templates/bootstrap/dashboard/js/api.tpl
+++ b/templates/bootstrap/dashboard/js/api.tpl
@@ -117,7 +117,7 @@ $(document).ready(function(){
       $('#b-nextdiff').html('n/a');
       $('#b-nextdiffc').html(' No Estimates');
     }
-    $('#b-esttimeperblock').html(data.getdashboarddata.data.pool.esttimeperblock.toString().toHHMMSS());
+    $('#b-esttimeperblock').html(data.getdashboarddata.data.pool.esttimeperblock.toHHMMSS());
     $('#b-nblock').html(data.getdashboarddata.data.network.block);
     $('#b-roundprogress').html(number_format(parseFloat(data.getdashboarddata.data.pool.shares.progress).toFixed(2), 2) + "%");
     {/literal}{if $GLOBAL.config.payout_system != 'pps'}{literal }
@@ -158,6 +158,7 @@ $(document).ready(function(){
 
   function refreshBlockData(data) {
     blocks = data.getdashboarddata.data.pool.blocks;
+    if (blocks.length <= 0) return;
     // Initilize
     if (lastBlock == 0) {
       lastBlock = blocks[0].height;