diff --git a/includes/discovery/os/arubaos.inc.php b/includes/discovery/os/arubaos.inc.php
index 2ce0bc11b8..7364e5d194 100644
--- a/includes/discovery/os/arubaos.inc.php
+++ b/includes/discovery/os/arubaos.inc.php
@@ -3,8 +3,5 @@
 if (!$os) {
     if (strstr($sysDescr, 'ArubaOS')) {
         $os = 'arubaos';
-    } elseif (preg_match('/HP(.+)2530(.+)/', $sysDescr)) {
-        //hp aruba 2530 series
-        $os = 'procurve';
     }
 }
diff --git a/includes/discovery/os/procurve.inc.php b/includes/discovery/os/procurve.inc.php
index d5a7377b86..f426670f29 100644
--- a/includes/discovery/os/procurve.inc.php
+++ b/includes/discovery/os/procurve.inc.php
@@ -6,5 +6,8 @@ if (!$os) {
     }
     else if (preg_match('/eCos-[0-9.]+/', $sysDescr)) {
         $os = 'procurve';
+    } elseif (preg_match('/HP(.+)2530(.+)/', $sysDescr)) {
+        //hp aruba 2530 series
+        $os = 'procurve';
     }
 }