diff --git a/samza-core/src/main/java/org/apache/samza/config/SystemConfig.java b/samza-core/src/main/java/org/apache/samza/config/SystemConfig.java
index 7b7a88e..9972f9d 100644
--- a/samza-core/src/main/java/org/apache/samza/config/SystemConfig.java
+++ b/samza-core/src/main/java/org/apache/samza/config/SystemConfig.java
@@ -113,7 +113,7 @@
    * @return SystemAdmin of the system if it exists, otherwise null.
    */
   public SystemAdmin getSystemAdmin(String systemName, String adminLabel) {
-    if (systemAdminMap.isEmpty() || (systemAdminMap.containsKey(systemName) && systemAdminMap.get(systemName).isStopped())) {
+    if (systemAdminMap.containsKey(systemName) && systemAdminMap.get(systemName).isStopped()) {
       systemAdminMap.clear();
     }
     return getSystemAdmins(adminLabel).get(systemName);