diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java
index 4830c61e224e9..634a225ccaeeb 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java
@@ -571,8 +571,9 @@ public long relationshipsGetCount( KernelStatement state )
     @Override
     public NewIndexDescriptor indexCreate( KernelStatement state, NodePropertyDescriptor descriptor )
     {
-        state.txState().indexRuleDoAdd( IndexBoundary.map( descriptor ) );
-        return IndexBoundary.map( descriptor );
+        NewIndexDescriptor newIndexDescriptor = IndexBoundary.map( descriptor );
+        state.txState().indexRuleDoAdd( newIndexDescriptor );
+        return newIndexDescriptor;
     }
 
     @Override