diff --git a/modules/comment.module b/modules/comment.module
index f140b9404ad90bfb302a4b4777b982f59d4c9490..6dc192c735102f6be750daf5ebf63da7c68dff20 100644
--- a/modules/comment.module
+++ b/modules/comment.module
@@ -814,7 +814,9 @@ function comment_admin_overview($status = 0, $comment_page = 0) {
     $next_link = la(t("next comments"), array("mod" => "comment", "status" => $status, "comment_page" => ($comment_page + 1)));
   }
 
-  $output .= "<tr><td>$prev_link</td><td></td><td></td><td></td><td></td><td>$next_link</td></tr>";
+  if ($prev_link || $next_link) {
+    $output .= "<tr><td>$prev_link</td><td></td><td></td><td></td><td></td><td>$next_link</td></tr>";
+  }
   $output .= "</table>\n";
 
   return $output;
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index f140b9404ad90bfb302a4b4777b982f59d4c9490..6dc192c735102f6be750daf5ebf63da7c68dff20 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -814,7 +814,9 @@ function comment_admin_overview($status = 0, $comment_page = 0) {
     $next_link = la(t("next comments"), array("mod" => "comment", "status" => $status, "comment_page" => ($comment_page + 1)));
   }
 
-  $output .= "<tr><td>$prev_link</td><td></td><td></td><td></td><td></td><td>$next_link</td></tr>";
+  if ($prev_link || $next_link) {
+    $output .= "<tr><td>$prev_link</td><td></td><td></td><td></td><td></td><td>$next_link</td></tr>";
+  }
   $output .= "</table>\n";
 
   return $output;