diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/action-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/action-context.xml
index 477d319ef4..52797d1848 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/action-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/action-context.xml
@@ -7,11 +7,12 @@
 
    <!--  Declare as Record action -->
    <!--  TODO rename -->
-   <bean id="create-record" parent="action-executer" class="org.alfresco.module.org_alfresco_module_rm.action.dm.CreateRecordAction">
+   <bean id="create-record" parent="action-executer"
+         class="org.alfresco.module.org_alfresco_module_rm.action.dm.CreateRecordAction">
       <property name="recordService" ref="RecordService" />
-       <property name="authenticationUtil" ref="rm.authenticationUtil" />
-       <property name="filePlanService" ref="FilePlanService" />
-       <property name="nodeService" ref="NodeService" />
+      <property name="authenticationUtil" ref="rm.authenticationUtil" />
+      <property name="filePlanService" ref="FilePlanService" />
+      <property name="nodeService" ref="NodeService" />
       <property name="applicableTypes">
          <list>
             <value>{http://www.alfresco.org/model/content/1.0}content</value>
@@ -26,6 +27,7 @@
       <property name="filePlanService" ref="FilePlanService" />
       <property name="dictionaryService" ref="DictionaryService" />
       <property name="authenticationUtil" ref="rm.authenticationUtil" />
+      <property name="recordService" ref="RecordService" />
       <property name="applicableTypes">
          <list>
             <value>{http://www.alfresco.org/model/content/1.0}content</value>
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordAction.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordAction.java
index ad076c240c..97dfa9a6e2 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordAction.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordAction.java
@@ -243,7 +243,6 @@ public class DeclareAsVersionRecordAction extends AuditableActionExecuterAbstrac
     {
         Map<QName, String> mapedAspects = new HashMap<>();
 
-        mapedAspects.put(ContentModel.ASPECT_VERSIONABLE, " does not have the versionable aspect applied.");
         mapedAspects.put(ASPECT_RECORD, " is already a record.");
         mapedAspects.put(ContentModel.ASPECT_WORKING_COPY, " is a working copy.");
         mapedAspects.put(ASPECT_RECORD_REJECTION_DETAILS, " has previously been rejected.");
@@ -251,7 +250,7 @@ public class DeclareAsVersionRecordAction extends AuditableActionExecuterAbstrac
 
         for (Map.Entry<QName, String> aspect : mapedAspects.entrySet())
         {
-            if (!nodeService.hasAspect(actionedUponNodeRef, aspect.getKey()))
+            if (nodeService.hasAspect(actionedUponNodeRef, aspect.getKey()))
             {
                 if (logger.isDebugEnabled())
                 {
@@ -260,6 +259,14 @@ public class DeclareAsVersionRecordAction extends AuditableActionExecuterAbstrac
                 return true;
             }
         }
+        if (!nodeService.hasAspect(actionedUponNodeRef, ContentModel.ASPECT_VERSIONABLE))
+        {
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Can not declare version record, because " + actionedUponNodeRef.toString() + " does not have the versionable aspect applied.");
+            }
+            return true;
+        }
         return false;
     }