diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index cd113f86081..03b03b61e39 100644
--- a/tools/marvin/marvin/lib/base.py
+++ b/tools/marvin/marvin/lib/base.py
@@ -1397,8 +1397,7 @@ class PublicIPAddress:
 
         cmd = listPublicIpAddresses.listPublicIpAddressesCmd()
         [setattr(cmd, k, v) for k, v in kwargs.items()]
-        if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
-            cmd.listall=True
+        cmd.listall=True
         return(apiclient.listPublicIpAddresses(cmd))