diff --git a/module/bug/view/browsedata.html.php b/module/bug/view/browsedata.html.php
index 2c9a299605..8cff0c11f8 100644
--- a/module/bug/view/browsedata.html.php
+++ b/module/bug/view/browsedata.html.php
@@ -41,6 +41,7 @@
         <?php endif;?>
       </tr>
       </thead>
+      <?php if($bugs):?>
       <tbody>
       <?php foreach($bugs as $bug):?>
       <?php $bugLink = inlink('view', "bugID=$bug->id");?>
@@ -96,3 +97,4 @@
       </tr>
       <?php endforeach;?>
       </tbody>
+      <?php endif;?>
diff --git a/module/product/view/browsedata.html.php b/module/product/view/browsedata.html.php
index e710de9144..aecfe996ad 100644
--- a/module/product/view/browsedata.html.php
+++ b/module/product/view/browsedata.html.php
@@ -26,6 +26,7 @@
         <th class='w-140px {sorter:false}'><?php echo $lang->actions;?></th>
       </tr>
       </thead>
+      <?php if($stories):?>
       <tbody>
       <?php foreach($stories as $key => $story):?>
       <?php
@@ -76,3 +77,4 @@
       </tr>
       <?php endforeach;?>
       </tbody>
+      <?php endif;?>
diff --git a/module/project/view/taskdata.html.php b/module/project/view/taskdata.html.php
index 96a598be27..46e5568601 100644
--- a/module/project/view/taskdata.html.php
+++ b/module/project/view/taskdata.html.php
@@ -37,6 +37,7 @@
           <th class='w-150px {sorter:false}'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
+      <?php if($tasks):?>
       <tbody>
       <?php foreach($tasks as $task):?>
       <?php $class = $task->assignedTo == $app->user->account ? 'style=color:red' : ''; ?>
@@ -106,3 +107,4 @@
       </tr>
       <?php endforeach;?>
       </tbody>
+      <?php endif?>
diff --git a/module/testcase/view/browsedata.html.php b/module/testcase/view/browsedata.html.php
index 46083376cb..693d42aef0 100644
--- a/module/testcase/view/browsedata.html.php
+++ b/module/testcase/view/browsedata.html.php
@@ -30,6 +30,7 @@
           <?php endif;?>
         </tr>
       </thead>
+      <?php if($cases):?>
       <tbody>
       <?php foreach($cases as $case):?>
       <tr class='text-center'>
@@ -74,3 +75,4 @@
       </tr>
       <?php endforeach;?>
       </tbody>
+      <?php endif;?>
diff --git a/module/testtask/view/casesdata.html.php b/module/testtask/view/casesdata.html.php
index a3bb929b51..6e07ec410b 100644
--- a/module/testtask/view/casesdata.html.php
+++ b/module/testtask/view/casesdata.html.php
@@ -26,12 +26,13 @@
           <th class='w-120px {sorter: false}'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
+      <?php
+      $canBatchEdit   = common::hasPriv('testcase', 'batchEdit');
+      $canBatchAssign = common::hasPriv('testtask', 'batchAssign');
+      $canBatchRun    = common::hasPriv('testtask', 'batchRun');
+      ?>
+      <?php if($runs):?>
       <tbody>
-        <?php
-        $canBatchEdit   = common::hasPriv('testcase', 'batchEdit');
-        $canBatchAssign = common::hasPriv('testtask', 'batchAssign');
-        $canBatchRun    = common::hasPriv('testtask', 'batchRun');
-        ?>
         <?php foreach($runs as $run):?>
         <tr class='text-center'>
           <td class='text-left'>
@@ -68,3 +69,4 @@
         </tr>
         <?php endforeach;?>
       </tbody>
+      <?php endif;?>