diff --git a/application/Espo/Resources/metadata/entityDefs/Note.json b/application/Espo/Resources/metadata/entityDefs/Note.json
index d95c5e314e..441331b3bf 100644
--- a/application/Espo/Resources/metadata/entityDefs/Note.json
+++ b/application/Espo/Resources/metadata/entityDefs/Note.json
@@ -16,6 +16,10 @@
             "type": "linkMultiple",
             "view": "Stream.Fields.AttachmentMultiple"
         },
+        "number": {
+            "type": "autoincrement",
+            "index": true
+        },
         "createdAt": {
             "type": "datetime",
             "readOnly": true
@@ -54,7 +58,7 @@
         }
     },
     "collection": {
-        "sortBy": "createdAt",
+        "sortBy": "number",
         "asc": false
     },
     "streamRelated": {
diff --git a/application/Espo/Services/Stream.php b/application/Espo/Services/Stream.php
index a1a3a4d904..54a298bb44 100644
--- a/application/Espo/Services/Stream.php
+++ b/application/Espo/Services/Stream.php
@@ -172,7 +172,7 @@ class Stream extends \Espo\Core\Services\Base
         $selectParams = array(
             'offset' => $params['offset'],
             'limit' => $params['maxSize'],
-            'orderBy' => 'createdAt',
+            'orderBy' => 'number',
             'order' => 'DESC',
             'customJoin' => "
                 JOIN subscription ON
@@ -242,7 +242,7 @@ class Stream extends \Espo\Core\Services\Base
             'whereClause' => $where,
             'offset' => $params['offset'],
             'limit' => $params['maxSize'],
-            'orderBy' => 'createdAt',
+            'orderBy' => 'number',
             'order' => 'DESC'
         ));