diff --git a/src/AI/CoreLogic.pm b/src/AI/CoreLogic.pm
index f637ab0ae2..78a7d26dbb 100644
--- a/src/AI/CoreLogic.pm
+++ b/src/AI/CoreLogic.pm
@@ -1489,8 +1489,13 @@ sub processAutoStorage {
 						# Use config steps based on storageAuto_npc_type
 						if ($config{'storageAuto_npc_type'} eq "" || $config{'storageAuto_npc_type'} eq "1") {
 							warning T("Warning storageAuto has changed. Please read News.txt\n") if ($config{'storageAuto_npc_type'} eq "");
-							$steps = "c r1";
-							debug "Using standard iRO npc storage steps.\n", "npc";
+							if (grep { $masterServer->{serverType} eq $_ } qw(ROla) && $config{'storageAuto_npc'} =~ /prontera|payon/i) {
+    							$steps = "c r2";
+								debug "Using standard ROla npc storage steps.\n", "npc";
+							} else {
+								$steps = "c r1";
+								debug "Using standard iRO npc storage steps.\n", "npc";
+							}
 						} elsif ($config{'storageAuto_npc_type'} eq "2") {
 							$steps = "c c r1";
 							debug "Using iRO comodo (location) npc storage steps.\n", "npc";