diff --git a/plugins/android/src/org/jetbrains/android/sdk/AndroidTargetData.java b/plugins/android/src/org/jetbrains/android/sdk/AndroidTargetData.java
index 5ae25345cba0..e2e5c5ba43cd 100644
--- a/plugins/android/src/org/jetbrains/android/sdk/AndroidTargetData.java
+++ b/plugins/android/src/org/jetbrains/android/sdk/AndroidTargetData.java
@@ -123,7 +123,7 @@ public class AndroidTargetData {
   }
 
   @Nullable
-  public RenderServiceFactory getRenderServiceFactory(@NotNull Project project) throws RenderingException, IOException {
+  public synchronized RenderServiceFactory getRenderServiceFactory(@NotNull Project project) throws RenderingException, IOException {
     if (myRenderServiceFactory == null) {
       final AttributeDefinitionsImpl attrDefs = getAttrDefsImpl(project);
       if (attrDefs == null) {