diff --git a/administrator/components/com_checkin/models/checkin.php b/administrator/components/com_checkin/models/checkin.php
index b686166b0b85e..323bdb90e2e33 100644
--- a/administrator/components/com_checkin/models/checkin.php
+++ b/administrator/components/com_checkin/models/checkin.php
@@ -196,6 +196,12 @@ public function getItems()
 				if ($db->execute())
 				{
 					$results[$tn] = $db->loadResult();
+
+					// Show only tables with items to checkin.
+					if ((int) $results[$tn] === 0)
+					{
+						unset($results[$tn]);
+					}
 				}
 				else
 				{
diff --git a/administrator/components/com_checkin/views/checkin/tmpl/default.php b/administrator/components/com_checkin/views/checkin/tmpl/default.php
index bd05ba4c48e12..437a0a5090454 100644
--- a/administrator/components/com_checkin/views/checkin/tmpl/default.php
+++ b/administrator/components/com_checkin/views/checkin/tmpl/default.php
@@ -29,7 +29,7 @@
 		<div class="clearfix"></div>
 		<?php if (empty($this->items)) : ?>
 			<div class="alert alert-no-items">
-				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+				<?php echo JText::_('COM_CHECKIN_NO_ITEMS'); ?>
 			</div>
 		<?php else : ?>
 			<table id="global-checkin" class="table table-striped">
@@ -58,11 +58,7 @@
 								</label>
 							</td>
 							<td>
-								<?php if ($count > 0) : ?>
-									<span class="label label-warning"><?php echo $count; ?></span>
-								<?php else : ?>
-									<span class="label label-info"><?php echo $count; ?></span>
-								<?php endif; ?>
+								<span class="label label-warning"><?php echo $count; ?></span>
 							</td>
 						</tr>
 						<?php $i++; ?>
diff --git a/administrator/language/en-GB/en-GB.com_checkin.ini b/administrator/language/en-GB/en-GB.com_checkin.ini
index a66ff22fa36d2..a16b243760790 100644
--- a/administrator/language/en-GB/en-GB.com_checkin.ini
+++ b/administrator/language/en-GB/en-GB.com_checkin.ini
@@ -16,6 +16,7 @@ COM_CHECKIN_ITEMS_TO_CHECK_IN_DESC="Items to check-in descending"
 COM_CHECKIN_N_ITEMS_CHECKED_IN_0="No item checked in."
 COM_CHECKIN_N_ITEMS_CHECKED_IN_1="1 item checked in."
 COM_CHECKIN_N_ITEMS_CHECKED_IN_MORE="%s items checked in."
+COM_CHECKIN_NO_ITEMS="There are no tables with checked out items or there are no tables with checked out items that match your search."
 COM_CHECKIN_TABLE="<em>%s</em> table"
 COM_CHECKIN_XML_DESCRIPTION="Check-in Component."
 JLIB_RULES_SETTING_NOTES="1. Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless it is overruled by a Global Configuration setting.<br /><br />2. Select Save to refresh the calculated settings."
\ No newline at end of file