diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/CompositeGenericKey.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/CompositeGenericKey.java
index 5830c74949169..395f6032298ed 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/CompositeGenericKey.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/CompositeGenericKey.java
@@ -27,9 +27,6 @@
 
 class CompositeGenericKey extends NativeIndexKey<CompositeGenericKey>
 {
-    // TODO we have multiple places defining size of the entityId!!
-    private static final int ENTITY_ID_SIZE = Long.BYTES;
-
     private GenericKeyState[] states;
 
     CompositeGenericKey( int length )
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DateIndexKey.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DateIndexKey.java
index a7f6110b92dad..aafee47b438c7 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DateIndexKey.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DateIndexKey.java
@@ -31,8 +31,8 @@
 class DateIndexKey extends NativeIndexSingleValueKey<DateIndexKey>
 {
     static final int SIZE =
-            Long.BYTES + /* epochDay */
-            Long.BYTES;  /* entityId */
+            Long.BYTES +    /* epochDay */
+            ENTITY_ID_SIZE; /* entityId */
 
     long epochDay;
 
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DurationIndexKey.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DurationIndexKey.java
index d1ad70585c82f..5233693cbb5bc 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DurationIndexKey.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DurationIndexKey.java
@@ -45,7 +45,7 @@ class DurationIndexKey extends NativeIndexSingleValueKey<DurationIndexKey>
             Integer.BYTES + /* nanosOfSecond */
             Long.BYTES +    /* months */
             Long.BYTES +    /* days */
-            Long.BYTES;     /* entityId */
+            ENTITY_ID_SIZE; /* entityId */
 
     long totalAvgSeconds;
     int nanosOfSecond;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/LocalDateTimeIndexKey.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/LocalDateTimeIndexKey.java
index cd034771f3575..c99830b6b4127 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/LocalDateTimeIndexKey.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/LocalDateTimeIndexKey.java
@@ -33,7 +33,7 @@ class LocalDateTimeIndexKey extends NativeIndexSingleValueKey<LocalDateTimeIndex
     static final int SIZE =
             Long.BYTES +    /* epochSecond */
             Integer.BYTES + /* nanoOfSecond */
-            Long.BYTES;     /* entityId */
+            ENTITY_ID_SIZE;     /* entityId */
 
     int nanoOfSecond;
     long epochSecond;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/LocalTimeIndexKey.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/LocalTimeIndexKey.java
index a8939788aee08..9e24a74f2f608 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/LocalTimeIndexKey.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/LocalTimeIndexKey.java
@@ -32,7 +32,7 @@ class LocalTimeIndexKey extends NativeIndexSingleValueKey<LocalTimeIndexKey>
 {
     static final int SIZE =
             Long.BYTES + /* nanoOfDay */
-            Long.BYTES;  /* entityId */
+            ENTITY_ID_SIZE;  /* entityId */
 
     long nanoOfDay;
 
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexKey.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexKey.java
index be79c0c00b7fb..f594349b956a0 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexKey.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexKey.java
@@ -26,6 +26,9 @@
 
 abstract class NativeIndexKey<SELF extends NativeIndexKey<SELF>> extends TemporalValueWriterAdapter<RuntimeException>
 {
+    // TODO this could use 6 bytes instead and have the highest 2 bits could be used for other meta info
+    static final int ENTITY_ID_SIZE = Long.BYTES;
+
     enum Inclusion
     {
         // Order of these is important, must be kept lower --> higher
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexKey.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexKey.java
index 7624ab0674f05..945344b1c7264 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexKey.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexKey.java
@@ -37,11 +37,9 @@
 class NumberIndexKey extends NativeIndexSingleValueKey<NumberIndexKey>
 {
     static final int SIZE =
-            Byte.BYTES + /* type of value */
-            Long.BYTES + /* raw value bits */
-
-            // TODO this could use 6 bytes instead and have the highest 2 bits stored in the type byte
-            Long.BYTES;  /* entityId */
+            Byte.BYTES +    /* type of value */
+            Long.BYTES +    /* raw value bits */
+            ENTITY_ID_SIZE; /* (Long.BYTES) entityId */
 
     byte type;
     long rawValueBits;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexKey.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexKey.java
index a97802e0d5183..caf72a1f52eea 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexKey.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexKey.java
@@ -38,8 +38,8 @@
 class SpatialIndexKey extends NativeIndexSingleValueKey<SpatialIndexKey>
 {
     static final int SIZE =
-            Long.BYTES + /* raw value bits */
-            Long.BYTES;  /* entityId */
+            Long.BYTES +    /* raw value bits */
+            ENTITY_ID_SIZE; /* entityId */
 
     long rawValueBits;
     CoordinateReferenceSystem crs;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexKey.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexKey.java
index 53fe302a40c1c..3dea06c52c14f 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexKey.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexKey.java
@@ -35,8 +35,6 @@
  */
 class StringIndexKey extends NativeIndexSingleValueKey<StringIndexKey>
 {
-    static final int ENTITY_ID_SIZE = Long.BYTES;
-
     private boolean ignoreLength;
 
     // UTF-8 bytes, grows on demand. Actual length is dictated by bytesLength field.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/ZonedDateTimeIndexKey.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/ZonedDateTimeIndexKey.java
index d3f9a96968c5c..64800591f0ad9 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/ZonedDateTimeIndexKey.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/ZonedDateTimeIndexKey.java
@@ -45,7 +45,7 @@ class ZonedDateTimeIndexKey extends NativeIndexSingleValueKey<ZonedDateTimeIndex
             Long.BYTES +    /* epochSecond */
             Integer.BYTES + /* nanoOfSecond */
             Integer.BYTES + /* timeZone */
-            Long.BYTES;     /* entityId */
+            ENTITY_ID_SIZE; /* entityId */
 
     long epochSecondUTC;
     int nanoOfSecond;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/ZonedTimeIndexKey.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/ZonedTimeIndexKey.java
index 93597b7ed8355..1d2048536ee5e 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/ZonedTimeIndexKey.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/ZonedTimeIndexKey.java
@@ -39,7 +39,7 @@ class ZonedTimeIndexKey extends NativeIndexSingleValueKey<ZonedTimeIndexKey>
     static final int SIZE =
             Long.BYTES +    /* nanosOfDayUTC */
             Integer.BYTES + /* zoneOffsetSeconds */
-            Long.BYTES;     /* entityId */
+            ENTITY_ID_SIZE; /* entityId */
 
     long nanosOfDayUTC;
     int zoneOffsetSeconds;