diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 4ac83e7343..8bb35d342b 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1786,6 +1786,8 @@ $os = 'hikvision';
 $config['os'][$os]['text'] = 'Hikvision';
 $config['os'][$os]['type'] = 'network';
 $config['os'][$os]['icon'] = 'hikvision';
+$config['os'][$os]['over'][0]['graph'] = 'device_uptime';
+$config['os'][$os]['over'][0]['text']  = 'Device Uptime';
 
 // Canopy / Cambium support
 $os = 'cambium';
diff --git a/includes/discovery/os/hikvision.inc.php b/includes/discovery/os/hikvision.inc.php
index 0caa79cd05..fcc45998f0 100644
--- a/includes/discovery/os/hikvision.inc.php
+++ b/includes/discovery/os/hikvision.inc.php
@@ -2,4 +2,6 @@
 
 if (str_contains(snmp_get($device, '.1.3.6.1.4.1.39165.1.6.0', '-Oqv', ''), 'Hikvision')) {
     $os = 'hikvision';
+} elseif (starts_with($sysDescr, 'Hikvision company products')) {
+    $os = 'hikvision';
 }
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index e478e13728..4604f1a405 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -584,6 +584,7 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
     public function testHikvision()
     {
         $this->checkOS('hikvision');
+        $this->checkOS('hikvision', 'hikvision1');
     }
 
     public function testHp3par()
diff --git a/tests/snmpsim/hikvision1.snmprec b/tests/snmpsim/hikvision1.snmprec
new file mode 100644
index 0000000000..9e2479b61a
--- /dev/null
+++ b/tests/snmpsim/hikvision1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Hikvision company products