diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index <HASH>..<HASH> 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -416,7 +416,6 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe
                 throw new UnsupportedOperationException("StorageService does not support switching modes.");
             return;
         }
-        initialized = true;
         isClientMode = false;
 
         // Ensure StorageProxy is initialized on start-up; see CASSANDRA-3797.
@@ -514,6 +513,7 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe
                 throw new UnsupportedOperationException("StorageService does not support switching modes.");
             return;
         }
+        initialized = true;
 
         if (Boolean.parseBoolean(System.getProperty("cassandra.join_ring", "true")))
         {
Fix broken isInitialized check from maybeJoinRing (#<I>)