diff --git a/bubble-server/src/main/java/bubble/resources/account/AuthResource.java b/bubble-server/src/main/java/bubble/resources/account/AuthResource.java
index 54774ff5..523c04e0 100644
--- a/bubble-server/src/main/java/bubble/resources/account/AuthResource.java
+++ b/bubble-server/src/main/java/bubble/resources/account/AuthResource.java
@@ -112,7 +112,7 @@ public class AuthResource {
     @GET @Path(EP_READY)
     public Response getNodeIsReady(@Context ContainerRequest ctx) {
         try {
-            if (configuration.getThisNetwork().getState().equals(BubbleNetworkState.restoring)) return ok();
+            if (configuration.getThisNetwork().getState() == BubbleNetworkState.restoring) return ok();
             if (deviceDAO.findByAccountAndUninitialized(accountDAO.getFirstAdmin().getUuid())
                     .stream()
                     .anyMatch(Device::configsOk)) {
diff --git a/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java b/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java
index 0edfa52a..3945ed92 100644
--- a/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java
+++ b/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java
@@ -306,7 +306,7 @@ public class BubbleConfiguration extends PgRestServerConfiguration
                         {TAG_LAUNCH_LOCK, isSageLauncher() || thisNetwork == null ? null : thisNetwork.launchLock()},
                         {TAG_RESTORE_MODE, thisNetwork == null
                                            ? false
-                                           : thisNetwork.getState().equals(BubbleNetworkState.restoring)
+                                           : thisNetwork.getState() == BubbleNetworkState.restoring
                                              && !restoreService.isRestoreStarted(thisNetwork.getUuid())},
                         {TAG_SSL_PORT, getDefaultSslPort()},
                         {TAG_SUPPORT, getSupport()},
diff --git a/bubble-server/src/main/java/bubble/server/listener/BubbleFirstTimeListener.java b/bubble-server/src/main/java/bubble/server/listener/BubbleFirstTimeListener.java
index eef0518d..3082c1f3 100644
--- a/bubble-server/src/main/java/bubble/server/listener/BubbleFirstTimeListener.java
+++ b/bubble-server/src/main/java/bubble/server/listener/BubbleFirstTimeListener.java
@@ -114,9 +114,9 @@ public class BubbleFirstTimeListener extends RestServerLifecycleListenerBase<Bub
 
     private void updateNetworkState(@NonNull final BubbleConfiguration config, @NonNull final BubbleNetwork network,
                                     @NonNull final FirstTimeType firstTimeType) {
-        if (network.getState().equals(BubbleNetworkState.starting)) {
-            network.setState(firstTimeType.equals(FirstTimeType.restore) ? BubbleNetworkState.restoring
-                                                                         : BubbleNetworkState.running);
+        if (network.getState() == BubbleNetworkState.starting) {
+            network.setState(firstTimeType == FirstTimeType.restore ? BubbleNetworkState.restoring
+                                                                    : BubbleNetworkState.running);
             config.getBean(BubbleNetworkDAO.class).update(network);
         }
     }