diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60dfa4acec0933e50944d56a2e3f6ad9f452ca6e..10652f17f2f515bb408d91ffc2f18564c7452f1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,8 +11,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-* Integer value is 32 bit now.
-
 ### Deprecated
 
 ### Removed
diff --git a/proto/caosdb/entity/v1alpha1/main.proto b/proto/caosdb/entity/v1alpha1/main.proto
index f9e83ebf38a209d71747f5fe6559ab8ca0b4cb80..605711e0e3378449eed4b44d6cb220b003899d5e 100644
--- a/proto/caosdb/entity/v1alpha1/main.proto
+++ b/proto/caosdb/entity/v1alpha1/main.proto
@@ -90,7 +90,7 @@ message ScalarValue {
   // Wraps different optimized representations of a single value.
   oneof scalar_value {
     // The value as integer
-    int32 integer_value = 1;
+    int64 integer_value = 1;
     // The value as double
     double double_value = 2;
     // The value as bool
@@ -384,6 +384,11 @@ enum MessageCode {
 
   // TODO(tf) This property overrides the name.
   MESSAGE_CODE_PROPERTY_WITH_NAME_OVERRIDE = 79;
+
+  // Indicates that this server cannot process this integer value because it is
+  // out of range. The integer range is an implementation detail and thus this
+  // can happen even though the API allows the value.
+  MESSAGE_CODE_INTEGER_VALUE_OUT_OF_RANGE = 80;
 }
 
 // Messages are used by server's or client's to transport *transient*
@@ -626,8 +631,8 @@ message RetrieveRequest {
   // Is the client requesting to download the file associated with the
   // retrieved entity or query results?
   bool register_file_download = 3;
-  //TODO Settings for the download. Ignored if register_file_download is false.
-  //FileTransmissionSettings download_settings = 4;
+  // TODO Settings for the download. Ignored if register_file_download is false.
+  // FileTransmissionSettings download_settings = 4;
 }
 
 // Response to a retrieve request