diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
index 03aa217ed1a..65d54fabc70 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
@@ -334,7 +334,7 @@ synchronized void setManagerState(ManagerState newState) {
     }
 
     if (oldState != newState && (newState == ManagerState.NORMAL)) {
-      if (!getFateRefs().isEmpty()) {
+      if (fateRefs.get() != null) {
         throw new IllegalStateException("Access to Fate should not have been"
             + " initialized prior to the Manager finishing upgrades. Please save"
             + " all logs and file a bug.");