diff --git a/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java b/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java
index 00589388c..2e7f4f250 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java
@@ -293,13 +293,15 @@ public class AdminMaintenanceAction extends FessAdminAction {
         if (fessEsClient.createIndex(docIndex, toIndex, numberOfShards, autoExpandReplicas, resetDictionaries)) {
             fessEsClient.admin().cluster().prepareHealth(toIndex).setWaitForYellowStatus().execute(ActionListener.wrap(response -> {
                 fessEsClient.addMapping(docIndex, "doc", toIndex);
-                fessEsClient.reindex(fromIndex, toIndex, replaceAliases);
-                if (replaceAliases && !fessEsClient.updateAlias(toIndex)) {
-                    logger.warn("Failed to update aliases for {} and {}", fromIndex, toIndex);
+                if (fessEsClient.reindex(fromIndex, toIndex, replaceAliases)) {
+                    if (replaceAliases && !fessEsClient.updateAlias(toIndex)) {
+                        logger.warn("Failed to update aliases for {} and {}", fromIndex, toIndex);
+                    }
                 }
             }, e -> logger.warn("Failed to reindex from {} to {}", fromIndex, toIndex, e)));
             return true;
         }
+
         saveError(messages -> messages.addErrorsFailedToReindex(GLOBAL, fromIndex, toIndex));
         return false;
     }