diff --git a/server/src/com/cloud/user/DomainManagerImpl.java b/server/src/com/cloud/user/DomainManagerImpl.java
index 54ca2ac44bd..791f58174e2 100644
--- a/server/src/com/cloud/user/DomainManagerImpl.java
+++ b/server/src/com/cloud/user/DomainManagerImpl.java
@@ -368,7 +368,9 @@ public class DomainManagerImpl implements DomainManager, DomainService, Manager
             }
             _accountMgr.checkAccess(caller, domain);
         } else {
-            domainId = caller.getDomainId();
+            if (caller.getType() != Account.ACCOUNT_TYPE_ADMIN) {
+                domainId = caller.getDomainId();
+            }
             if (listAll) {
                 isRecursive = true;
             }