diff --git a/src/presenter/list-presenter.js b/src/presenter/list-presenter.js
index 65b532e..fa85625 100644
--- a/src/presenter/list-presenter.js
+++ b/src/presenter/list-presenter.js
@@ -35,7 +35,6 @@ export default class ListPresenter {
 
   #sortComponent = null;
   #currentSortType = SortType.DAY;
-  #filterType = FilterType.EVERYTHING;
   #isLoading = true;
 
   #uiBlocker = new UiBlocker({
@@ -72,9 +71,8 @@ export default class ListPresenter {
   }
 
   get tripPoints() {
-    this.#filterType = this.#filtersModel.filter;
     const tripPoints = this.#pointsTripModel.points;
-    const filteredTripPoints = filter[this.#filterType](tripPoints);
+    const filteredTripPoints = filter[this.#filtersModel.filter](tripPoints);
     switch (this.#currentSortType) {
       case SortType.DAY:
         return filteredTripPoints.sort(sortEventsByDay);
diff --git a/src/view/filters-events-view.js b/src/view/filters-events-view.js
index e4e9e25..7fb5bca 100644
--- a/src/view/filters-events-view.js
+++ b/src/view/filters-events-view.js
@@ -15,7 +15,9 @@ function createFiltersEventsTemplate(filters, currentFilterType) {
                 type="radio"
                 name="trip-filter"
                 value="${filter.type}"
-                ${filter.type === currentFilterType && 'checked'}>
+                ${filter.type === currentFilterType && 'checked'}
+                 ${filter.count === 0 ? 'disabled' : ''}
+              >
               <label class="trip-filters__filter-label" for="filter-${filter.type}">${filter.type}</label>
             </div>
           `)).join('')}