diff --git a/maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java b/maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java
index 0e4bebc8dd56a5633e8bb60e7bba55cb95c1979d..8ab914679a0a85ab9b9104120124e34645368be5 100644
--- a/maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java
+++ b/maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java
@@ -122,6 +122,14 @@ public class RedeployPublisher extends Recorder {
             return true;
         }
 
+        if(build instanceof MavenModuleSetBuild && ((MavenModuleSetBuild)build).getParent().isArchivingDisabled()){
+          listener.getLogger().println("[ERROR] You cannot use the \"Deploy artifacts to Maven repository\" feature if you " +
+                                           "disabled " +
+                                           "automatic artifact archiving");
+          build.setResult(Result.FAILURE);
+          return true;
+        }
+
         listener.getLogger().println("Deploying artifacts to "+url);
         try {
             
diff --git a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help.html b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help.html
index 5e876525b811fb5f27f48564745b2e8fd4450622..5612392b9630af1036e57e3c9dd8d86b77b44f4a 100644
--- a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help.html
+++ b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help.html
@@ -13,4 +13,8 @@
   Note that regardless of this configuration, you can always manually come back
   to Jenkins and deploy any of the past artifacts to any repository of your choice,
   after the fact.
+
+  <p>
+  <b>To use this feature you shouldn't deactivate the automatic artifact archiving.</b>
+  </p>
 </div>
\ No newline at end of file
diff --git a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_de.html b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_de.html
index a6b2d79f3e6ecd36a5ba2ff8670ea20deb37fbc6..769dd67abf05da91c9d51e9bc1fb834210f595a4 100644
--- a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_de.html
+++ b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_de.html
@@ -11,4 +11,9 @@
   <p>
   Hinweis: Unabhängig von dieser Einstellung können Sie aber auch jederzeit manuell
   Artefakte aus durchgeführten Builds in beliebige Repositories ausbringen.
+
+  <p>
+  <b>To use this feature you shouldn't deactivate the automatic artifact archiving.</b>
+  </p>
+
 </div>
\ No newline at end of file
diff --git a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_fr.html b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_fr.html
index 5e876525b811fb5f27f48564745b2e8fd4450622..5612392b9630af1036e57e3c9dd8d86b77b44f4a 100644
--- a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_fr.html
+++ b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_fr.html
@@ -13,4 +13,8 @@
   Note that regardless of this configuration, you can always manually come back
   to Jenkins and deploy any of the past artifacts to any repository of your choice,
   after the fact.
+
+  <p>
+  <b>To use this feature you shouldn't deactivate the automatic artifact archiving.</b>
+  </p>
 </div>
\ No newline at end of file
diff --git a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_ja.html b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_ja.html
index 46c4773ea884ded2bf389f2c53aae97cbe37b5ac..7e1586ab08299389752f40975dd2bd962bbd61b1 100644
--- a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_ja.html
+++ b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_ja.html
@@ -9,4 +9,8 @@
 
   <p>
   この設定を行っているかによらず、Jenkinsの画面からいつでも過去の成果物を任意のリポジトリにデプロイできます。
+
+  <p>
+  <b>To use this feature you shouldn't deactivate the automatic artifact archiving.</b>
+  </p>
 </div>
\ No newline at end of file