diff --git a/src/MediaObserver.php b/src/MediaObserver.php
index <HASH>..<HASH> 100644
--- a/src/MediaObserver.php
+++ b/src/MediaObserver.php
@@ -10,7 +10,9 @@ class MediaObserver
 {
     public function creating(Media $media)
     {
-        $media->setHighestOrderNumber();
+        if ($media->shouldSortWhenCreating()) {
+            $media->setHighestOrderNumber();
+        }
     }
 
     public function updating(Media $media)
add missing condition - should sort when creating (#<I>)