diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
index b69af29123..6acd408d6e 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
@@ -486,10 +486,6 @@ public class RecordServiceImpl extends BaseBehaviourBean
                             }
                         }
 
-                        // create and file the content as a record
-                        file(nodeRef);
-                        // recalculate disposition schedule for the record when linking it
-                        dispositionService.recalculateNextDispositionStep(nodeRef);
                     }
                 }
                 catch (RecordLinkRuntimeException e)
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordUtils.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordUtils.java
index c8fa357596..81c14e4048 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordUtils.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordUtils.java
@@ -56,6 +56,11 @@ public class RecordUtils
     {
         mandatory("nodeService", nodeService);
         mandatory("nodeRef", nodeRef);
+        
+        if(nodeService.hasAspect(nodeRef, ContentModel.ASPECT_NO_CONTENT))
+        {
+        	return;
+        }
 
         // get the record id
         String recordId = (String) nodeService.getProperty(nodeRef, PROP_IDENTIFIER);