diff --git a/apps/accounts/admin_site.py b/apps/accounts/admin_site.py
index f12cbf58..201a22f0 100644
--- a/apps/accounts/admin_site.py
+++ b/apps/accounts/admin_site.py
@@ -238,21 +238,21 @@ def get_app_list(self, request, app_label=None):
         if app_label:
             return app_list
 
-        if flag_is_active(request, "provider_request"):
-            verification_request_item = {
-                "name": "New provider portal",
-                "app_label": "greencheck",
-                "app_url": reverse("provider_portal_home"),
-                "models": [
-                    {
-                        "name": "Move to a new version of provider portal",
-                        "object_name": "greencheck_url",
-                        "admin_url": reverse("provider_portal_home"),
-                        "view_only": True,
-                    }
-                ],
-            }
-            app_list.insert(0, verification_request_item)
+        
+        verification_request_item = {
+            "name": "New provider portal",
+            "app_label": "greencheck",
+            "app_url": reverse("provider_portal_home"),
+            "models": [
+                {
+                    "name": "Move to a new version of provider portal",
+                    "object_name": "greencheck_url",
+                    "admin_url": reverse("provider_portal_home"),
+                    "view_only": True,
+                }
+            ],
+        }
+        app_list.insert(0, verification_request_item)
 
         app_list += [
             {
diff --git a/apps/greencheck/tests/models/test_greencheck_stats.py b/apps/greencheck/tests/models/test_greencheck_stats.py
index ad82fc5c..5b8a7504 100644
--- a/apps/greencheck/tests/models/test_greencheck_stats.py
+++ b/apps/greencheck/tests/models/test_greencheck_stats.py
@@ -13,7 +13,6 @@
 from django.core import management
 from django.utils import timezone
 from dramatiq.brokers import stub
-from waffle.testutils import override_flag
 
 from ....accounts import models as ac_models
 from ... import choices as gc_choices
diff --git a/apps/greencheck/views.py b/apps/greencheck/views.py
index a879f2c7..b88d6e71 100644
--- a/apps/greencheck/views.py
+++ b/apps/greencheck/views.py
@@ -14,6 +14,8 @@
 
 import django_filters
 
+from waffle.mixins import WaffleFlagMixin
+
 from apps.accounts.models.hosting import Hostingprovider
 from apps.greencheck.models.checks import GreenDomain
 from apps.greencheck.models.stats import DailyStat
@@ -59,8 +61,9 @@ def get_context_data(self, **kwargs):
         return context
 
 
-class GreencheckStatsView(TemplateView):
+class GreencheckStatsView(WaffleFlagMixin, TemplateView):
     template_name = "greencheck/stats_index.html"
+    waffle_flag = "greencheck-stats"
 
     def _get_headline_counts(self, daily_stat_queryset=None):
         """