diff --git a/language/en-GB/en-GB.mod_articles_category.ini b/language/en-GB/en-GB.mod_articles_category.ini
index 018eb4e2219bb..865086b0be20a 100644
--- a/language/en-GB/en-GB.mod_articles_category.ini
+++ b/language/en-GB/en-GB.mod_articles_category.ini
@@ -68,6 +68,7 @@ MOD_ARTICLES_CATEGORY_FIELD_SHOWINTROTEXT_DESC="Select Show if you would like th
 MOD_ARTICLES_CATEGORY_FIELD_SHOWINTROTEXT_LABEL="Introtext"
 MOD_ARTICLES_CATEGORY_FIELD_SHOWONARTICLEPAGE_DESC="Select to Show or hide Article List from Article Pages. This means that the module will only display itself dynamically on Category Pages."
 MOD_ARTICLES_CATEGORY_FIELD_SHOWONARTICLEPAGE_LABEL="Show on Article Page"
+MOD_ARTICLES_CATEGORY_FIELD_SHOWTAGS_DESC="Show the tags for each article."
 MOD_ARTICLES_CATEGORY_FIELD_STARTDATE_DESC="Please enter a Starting Date."
 MOD_ARTICLES_CATEGORY_FIELD_STARTDATE_LABEL="Start Date Range"
 MOD_ARTICLES_CATEGORY_OPTION_ASCENDING_VALUE="Ascending"
diff --git a/modules/mod_articles_category/helper.php b/modules/mod_articles_category/helper.php
index a7c5c14e58d69..b16131fbc5c17 100644
--- a/modules/mod_articles_category/helper.php
+++ b/modules/mod_articles_category/helper.php
@@ -46,9 +46,7 @@ public static function getList(&$params)
 		$articles->setState('list.start', 0);
 		$articles->setState('list.limit', (int) $params->get('count', 0));
 		$articles->setState('filter.published', 1);
-
-		// This module does not use tags data
-		$articles->setState('load_tags', $params->get('filter_tag', '') !== '' ? true : false);
+		$articles->setState('load_tags', $params->get('show_tags', 0));
 
 		// Access filter
 		$access     = !JComponentHelper::getParams('com_content')->get('show_noauth');
diff --git a/modules/mod_articles_category/mod_articles_category.xml b/modules/mod_articles_category/mod_articles_category.xml
index 14d32c0851df9..b415a4eda4de8 100644
--- a/modules/mod_articles_category/mod_articles_category.xml
+++ b/modules/mod_articles_category/mod_articles_category.xml
@@ -459,6 +459,19 @@
 					<option value="0">JHIDE</option>
 				</field>
 
+				<field
+					name="show_tags"
+					type="radio"
+					label="JTAG"
+					description="MOD_ARTICLES_CATEGORY_FIELD_SHOWTAGS_DESC"
+					default="0"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+				</field>
+
 				<field
 					name="show_introtext"
 					type="radio"
diff --git a/modules/mod_articles_category/tmpl/default.php b/modules/mod_articles_category/tmpl/default.php
index 072ad20ac9193..6b467ec53c614 100644
--- a/modules/mod_articles_category/tmpl/default.php
+++ b/modules/mod_articles_category/tmpl/default.php
@@ -48,6 +48,12 @@
 							<span class="mod-articles-category-date"><?php echo $item->displayDate; ?></span>
 						<?php endif; ?>
 
+						<?php if ($params->get('show_tags', 0) && $item->tags->itemTags) : ?>
+							<div class="mod-articles-category-tags">
+								<?php echo JLayoutHelper::render('joomla.content.tags', $item->tags->itemTags); ?>
+							</div>
+						<?php endif; ?>
+
 						<?php if ($params->get('show_introtext')) : ?>
 							<p class="mod-articles-category-introtext">
 								<?php echo $item->displayIntrotext; ?>
@@ -112,6 +118,12 @@
 					</span>
 				<?php endif; ?>
 
+				<?php if ($params->get('show_tags', 0) && $item->tags->itemTags) : ?>
+					<div class="mod-articles-category-tags">
+						<?php echo JLayoutHelper::render('joomla.content.tags', $item->tags->itemTags); ?>
+					</div>
+				<?php endif; ?>
+
 				<?php if ($params->get('show_introtext')) : ?>
 					<p class="mod-articles-category-introtext">
 						<?php echo $item->displayIntrotext; ?>