diff --git a/Assets/Coffee/UIExtensions/UIParticle/Editor/UIParticleEditor.cs b/Assets/Coffee/UIExtensions/UIParticle/Editor/UIParticleEditor.cs
index 5058708..ab30d1c 100644
--- a/Assets/Coffee/UIExtensions/UIParticle/Editor/UIParticleEditor.cs
+++ b/Assets/Coffee/UIExtensions/UIParticle/Editor/UIParticleEditor.cs
@@ -143,7 +143,7 @@ namespace Coffee.UIExtensions
 			foreach (UIParticle uip in _particles)
 			{
 				ParticleSystem ps = uip.cachedParticleSystem;
-				if (!ps)
+				if (!ps || !uip.canvas)
 				{
 					continue;
 				}
diff --git a/Assets/Coffee/UIExtensions/UIParticle/UIParticle.cs b/Assets/Coffee/UIExtensions/UIParticle/UIParticle.cs
index fe3a1a2..537f6ac 100755
--- a/Assets/Coffee/UIExtensions/UIParticle/UIParticle.cs
+++ b/Assets/Coffee/UIExtensions/UIParticle/UIParticle.cs
@@ -242,11 +242,11 @@ namespace Coffee.UIExtensions
 		/// </summary>
 		static void UpdateMeshes ()
 		{
-			foreach (var uip in s_ActiveParticles)
+			for (int i = 0; i < s_ActiveParticles.Count; i++)
 			{
-				if(uip)
+				if (s_ActiveParticles [i])
 				{
-					uip.UpdateMesh ();
+					s_ActiveParticles [i].UpdateMesh ();
 				}
 			}
 		}