diff --git a/src/registrar/registrar_middleware.py b/src/registrar/registrar_middleware.py
index 0bedec3ca..5323d513f 100644
--- a/src/registrar/registrar_middleware.py
+++ b/src/registrar/registrar_middleware.py
@@ -162,6 +162,10 @@ class CheckPortfolioMiddleware:
                 request.session["portfolio"] = request.user.get_first_portfolio()
             else:
                 request.session["portfolio"] = None
+        else: 
+            # Edge case: waffle flag is changed while the user is logged in
+            if not request.user.is_org_user(request) and request.session.get("portfolio"):
+                request.session["portfolio"] = None
 
         if request.session.get("portfolio"):
             if current_path == self.home:
diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index 2e7bb978e..b8ed5c074 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -2,6 +2,7 @@ from django.urls import reverse
 from api.tests.common import less_console_noise_decorator
 from registrar.config import settings
 from registrar.models import Portfolio, SeniorOfficial
+from unittest import skip
 from django_webtest import WebTest  # type: ignore
 from registrar.models import (
     DomainRequest,
@@ -532,3 +533,7 @@ class TestPortfolio(WebTest):
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, "Domain name")
         permission.delete()
+
+    @skip("TODO")
+    def test_portfolio_cache_updates_when_modified(self):
+        pass
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 7c19c3af2..5beb74e94 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -522,6 +522,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
                 return HttpResponseRedirect(reverse("domain-requests"))
             else:
                 return HttpResponseRedirect(reverse("home"))
+
         # otherwise, proceed as normal
         return self.goto_next_step()