diff --git a/app/coffee/modules/controllerMixins.coffee b/app/coffee/modules/controllerMixins.coffee
index bf0290b7..a6c501cd 100644
--- a/app/coffee/modules/controllerMixins.coffee
+++ b/app/coffee/modules/controllerMixins.coffee
@@ -204,6 +204,7 @@ class UsFiltersMixin
         loadFilters.status = urlfilters.status
         loadFilters.assigned_to = urlfilters.assigned_to
         loadFilters.owner = urlfilters.owner
+        loadFilters.epic = urlfilters.epic
         loadFilters.q = urlfilters.q
 
         return @q.all([
@@ -221,10 +222,8 @@ class UsFiltersMixin
                 it.id = it.name
 
                 return it
-
             tagsWithAtLeastOneElement = _.filter tags, (tag) ->
                 return tag.count > 0
-
             assignedTo = _.map data.assigned_to, (it) ->
                 if it.id
                     it.id = it.id.toString()
@@ -239,6 +238,15 @@ class UsFiltersMixin
                 it.name = it.full_name
 
                 return it
+            epic = _.map data.epics, (it) ->
+                if it.id
+                    it.id = it.id.toString()
+                    it.name = "##{it.ref} #{it.subject}"
+                else
+                    it.id = "null"
+                    it.name = "Not in an epic"
+
+                return it
 
             @.selectedFilters = []
 
@@ -258,6 +266,10 @@ class UsFiltersMixin
                 selected = @.formatSelectedFilters("owner", owner, loadFilters.owner)
                 @.selectedFilters = @.selectedFilters.concat(selected)
 
+            if loadFilters.epic
+                selected = @.formatSelectedFilters("epic", epic, loadFilters.epic)
+                @.selectedFilters = @.selectedFilters.concat(selected)
+
             @.filterQ = loadFilters.q
 
             @.filters = [
@@ -282,6 +294,11 @@ class UsFiltersMixin
                     title: @translate.instant("COMMON.FILTERS.CATEGORIES.CREATED_BY"),
                     dataType: "owner",
                     content: owner
+                },
+                {
+                    title: @translate.instant("COMMON.FILTERS.CATEGORIES.EPIC"),
+                    dataType: "epic",
+                    content: epic
                 }
             ]
 
diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index 1be0721f..31e0225b 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -218,7 +218,8 @@
                 "TAGS": "Tags",
                 "ASSIGNED_TO": "Assigned to",
                 "CREATED_BY": "Created by",
-                "CUSTOM_FILTERS": "Custom filters"
+                "CUSTOM_FILTERS": "Custom filters",
+                "EPIC": "Epic"
             },
             "CONFIRM_DELETE": {
                 "TITLE": "Delete custom filter",