diff --git a/core/src/main/java/com/confighub/core/store/Store.java b/core/src/main/java/com/confighub/core/store/Store.java
index 9d4efaf..add1715 100644
--- a/core/src/main/java/com/confighub/core/store/Store.java
+++ b/core/src/main/java/com/confighub/core/store/Store.java
@@ -1675,8 +1675,6 @@ else if ( CtxLevel.LevelType.Standalone == type )
 
             // ToDo: should we save assignments
 
-            saveOrUpdateAudited( user, repository, ctxLevel );
-
             if ( updatePropertyContextStrings )
             {
                 if ( null != ctxLevel.getProperties() )
@@ -1690,6 +1688,7 @@ else if ( CtxLevel.LevelType.Standalone == type )
                 }
             }
 
+            saveOrUpdateAudited( user, repository, ctxLevel );
             return ctxLevel;
         }