diff --git a/Plugins/Effekseer/Source/Effekseer/Private/EffekseerEmitterComponent.cpp b/Plugins/Effekseer/Source/Effekseer/Private/EffekseerEmitterComponent.cpp
index 298c2bc..22e47e2 100644
--- a/Plugins/Effekseer/Source/Effekseer/Private/EffekseerEmitterComponent.cpp
+++ b/Plugins/Effekseer/Source/Effekseer/Private/EffekseerEmitterComponent.cpp
@@ -47,7 +47,7 @@ class FEffekseerEmitterSceneProxy : public FPrimitiveSceneProxy
 #if WITH_EDITOR
 		if (GShaderCompilingManager->IsCompiling())
 		{
-			return;
+		//	return;
 		}
 #endif
 
diff --git a/Plugins/Effekseer/Source/Effekseer/Private/EffekseerSystemSceneProxy.cpp b/Plugins/Effekseer/Source/Effekseer/Private/EffekseerSystemSceneProxy.cpp
index f8d9a0c..2130303 100644
--- a/Plugins/Effekseer/Source/Effekseer/Private/EffekseerSystemSceneProxy.cpp
+++ b/Plugins/Effekseer/Source/Effekseer/Private/EffekseerSystemSceneProxy.cpp
@@ -59,7 +59,7 @@ void FEffekseerSystemSceneProxy::GetDynamicMeshElements(const TArray<const FScen
 #if WITH_EDITOR
 	if (GShaderCompilingManager->IsCompiling())
 	{
-		return;
+	//	return;
 	}
 #endif
 
@@ -105,8 +105,11 @@ FPrimitiveViewRelevance FEffekseerSystemSceneProxy::GetViewRelevance(const FScen
 
 void FEffekseerSystemSceneProxy::ConvertInternalHandleToEffekseerHandles(const std::vector<int32_t>& internalHandles, std::vector<int32_t>& efkHandles)
 {
+#if ENGINE_MAJOR_VERSION == 4
 	check(IsInRenderingThread());
-	//std::lock_guard<std::mutex> lock(criticalSection_);
+#endif
+
+	std::lock_guard<std::mutex> lock(mutex_removedHandles_);
 
 	efkHandles.clear();