diff --git a/Source/Engine/Particles/ParticleSystem.cpp b/Source/Engine/Particles/ParticleSystem.cpp
index 6f001bf44..e70e5769d 100644
--- a/Source/Engine/Particles/ParticleSystem.cpp
+++ b/Source/Engine/Particles/ParticleSystem.cpp
@@ -424,15 +424,12 @@ Asset::LoadResult ParticleSystem::load()
                 Emitters[i]->WaitForLoaded();
         }
 
-        if (version <= 3)
-        {
-            // [Deprecated on 03.09.2021 expires on 03.09.2023]
-        }
-        else
-        {
-            // Load parameters overrides
-            int32 overridesCount = 0;
+        // Load parameters overrides
+        int32 overridesCount = 0;
+        if (stream.CanRead())
             stream.ReadInt32(&overridesCount);
+        if (overridesCount != 0)
+        {
             EmitterParameterOverrideKey key;
             Variant value;
             for (int32 i = 0; i < overridesCount; i++)
diff --git a/Source/Engine/Particles/Particles.cpp b/Source/Engine/Particles/Particles.cpp
index fc645bb60..21001d91f 100644
--- a/Source/Engine/Particles/Particles.cpp
+++ b/Source/Engine/Particles/Particles.cpp
@@ -620,7 +620,7 @@ void DrawEmitterGPU(RenderContext& renderContext, ParticleBuffer* buffer, DrawCa
     auto emitter = buffer->Emitter;
 
     // Check if need to perform any particles sorting
-    if (emitter->Graph.SortModules.HasItems() && renderContext.View.Pass != DrawPass::Depth)
+    if (emitter->Graph.SortModules.HasItems() && renderContext.View.Pass != DrawPass::Depth && buffer->GPU.ParticlesCountMax != 0)
     {
         PROFILE_GPU_CPU_NAMED("Sort Particles");