diff --git a/src/registrar/models/user_portfolio_permission.py b/src/registrar/models/user_portfolio_permission.py
index abbd20afb..c2cdc61ad 100644
--- a/src/registrar/models/user_portfolio_permission.py
+++ b/src/registrar/models/user_portfolio_permission.py
@@ -100,12 +100,12 @@ class UserPortfolioPermission(TimeStampedModel):
 
         # Check if a user is set without accessing the related object.
         has_user = bool(self.user_id)
-        # Have to create a bogus request to set the user and pass to flag_is_active
-        request = HttpRequest()
-        request.user = self.user
-        if not flag_is_active(request, "multiple_portfolios") and self.pk is None and has_user:
+        if self.pk is None and has_user:
+            # Have to create a bogus request to set the user and pass to flag_is_active
+            request = HttpRequest()
+            request.user = self.user
             existing_permissions = UserPortfolioPermission.objects.filter(user=self.user)
-            if existing_permissions.exists():
+            if not flag_is_active(request, "multiple_portfolios") and existing_permissions.exists():
                 raise ValidationError(
                     "Only one portfolio permission is allowed per user when multiple portfolios are disabled."
                 )
diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index 227548b61..9f55fced1 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -1483,10 +1483,6 @@ class TestUser(TestCase):
 
         portfolio, _ = Portfolio.objects.get_or_create(creator=self.user, organization_name="Hotel California")
 
-        # TODO - uncomment this when we just pass request to these functions
-        # request = get_wsgi_request_object(self.client, self.user)
-        # user_can_view_all_domains = self.user.has_domains_portfolio_permission(request)
-        # user_can_view_all_requests = self.user.has_domain_requests_portfolio_permission(request)
         user_can_view_all_domains = self.user.has_domains_portfolio_permission(portfolio)
         user_can_view_all_requests = self.user.has_domain_requests_portfolio_permission(portfolio)
 
@@ -1499,10 +1495,6 @@ class TestUser(TestCase):
             additional_permissions=[UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS],
         )
 
-        # TODO - uncomment this when we just pass request to these functions
-        # request = get_wsgi_request_object(self.client, self.user)
-        # user_can_view_all_domains = self.user.has_domains_portfolio_permission(request)
-        # user_can_view_all_requests = self.user.has_domain_requests_portfolio_permission(request)
         user_can_view_all_domains = self.user.has_domains_portfolio_permission(portfolio)
         user_can_view_all_requests = self.user.has_domain_requests_portfolio_permission(portfolio)
 
@@ -1513,10 +1505,6 @@ class TestUser(TestCase):
         portfolio_permission.save()
         portfolio_permission.refresh_from_db()
 
-        # TODO - uncomment this when we just pass request to these functions
-        # request = get_wsgi_request_object(self.client, self.user)
-        # user_can_view_all_domains = self.user.has_domains_portfolio_permission(request)
-        # user_can_view_all_requests = self.user.has_domain_requests_portfolio_permission(request)
         user_can_view_all_domains = self.user.has_domains_portfolio_permission(portfolio)
         user_can_view_all_requests = self.user.has_domain_requests_portfolio_permission(portfolio)
 
@@ -1525,10 +1513,6 @@ class TestUser(TestCase):
 
         UserDomainRole.objects.get_or_create(user=self.user, domain=self.domain, role=UserDomainRole.Roles.MANAGER)
 
-        # TODO - uncomment this when we just pass request to these functions
-        # request = get_wsgi_request_object(self.client, self.user)
-        # user_can_view_all_domains = self.user.has_domains_portfolio_permission(request)
-        # user_can_view_all_requests = self.user.has_domain_requests_portfolio_permission(request)
         user_can_view_all_domains = self.user.has_domains_portfolio_permission(portfolio)
         user_can_view_all_requests = self.user.has_domain_requests_portfolio_permission(portfolio)