diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index a435c8a50c..ca5f8c164c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -65,6 +65,10 @@ Changed
 
 Fixed
 ~~~~~
+* Fix the action query when filtering tags. The old implementation returned actions which have the
+  provided name as action name and not as tag name. (bug fix) #4828
+
+  Reported by @AngryDeveloper and contributed by Marcel Weinberg (@winem) 
 * Fix the passing of arrays to shell scripts where the arrays where not detected as such by the 
   st2 action_db utility. This caused arrays to be passed as Python lists serialized into a string.
 
diff --git a/st2api/st2api/controllers/v1/actions.py b/st2api/st2api/controllers/v1/actions.py
index 792d456829..906b9aecef 100644
--- a/st2api/st2api/controllers/v1/actions.py
+++ b/st2api/st2api/controllers/v1/actions.py
@@ -62,7 +62,7 @@ class ActionsController(resource.ContentPackResourceController):
     supported_filters = {
         'name': 'name',
         'pack': 'pack',
-        'tags': 'name'
+        'tags': 'tag.name'
     }
 
     query_options = {