diff --git a/src/utilities/general.c b/src/utilities/general.c
index e618e1fe6..6d37e755c 100644
--- a/src/utilities/general.c
+++ b/src/utilities/general.c
@@ -243,9 +243,6 @@ HYPRE_Initialize(void)
       return hypre_error_flag;
    }
 
-   /* Update library state */
-   hypre_SetInitialized();
-
 #if defined(HYPRE_USING_MEMORY_TRACKER)
    if (!_hypre_memory_tracker)
    {
@@ -340,6 +337,9 @@ HYPRE_Initialize(void)
    hypre_UmpireInit(_hypre_handle);
 #endif
 
+   /* Update library state */
+   hypre_SetInitialized();
+
    return hypre_error_flag;
 }
 
@@ -358,9 +358,6 @@ HYPRE_Finalize(void)
       return hypre_error_flag;
    }
 
-   /* Update library state */
-   hypre_SetFinalized();
-
 #if defined(HYPRE_USING_UMPIRE)
    hypre_UmpireFinalize(_hypre_handle);
 #endif
@@ -385,6 +382,9 @@ HYPRE_Finalize(void)
    _hypre_memory_tracker = NULL;
 #endif
 
+   /* Update library state */
+   hypre_SetFinalized();
+
    return hypre_error_flag;
 }