diff --git a/html/pages/device/apps/proxmox.inc.php b/html/pages/device/apps/proxmox.inc.php
index bc661cfb34..5adf31ff14 100644
--- a/html/pages/device/apps/proxmox.inc.php
+++ b/html/pages/device/apps/proxmox.inc.php
@@ -20,35 +20,40 @@ include('includes/application/proxmox.inc.php');
 
 global $config;
 
-$graphs = array(
-    'proxmox_traffic'       => 'Traffic',
-);
+if (!isset($config['enable_proxmox']) || !$config['enable_proxmox']) {
+    print_error('Proxmox agent was discovered on this host. Please enable Proxmox in your config.');
+} else {
 
-foreach (proxmox_node_vms(var_get('device')) as $nvm) {
-    $vm = proxmox_vm_info($nvm['vmid'], $nvm['cluster']);
+    $graphs = array(
+        'proxmox_traffic'       => 'Traffic',
+    );
 
-    foreach ($vm['ports'] as $port) {
-        foreach ($graphs as $key => $text) {
-	        $graph_type = 'proxmox_traffic';
-	
-	        $graph_array['height']    = '100';
-	        $graph_array['width']     = '215';
-	        $graph_array['to']        = $config['time']['now'];
-	        $graph_array['id']        = $vm['app_id'];
-	        $graph_array['device_id'] = $vm['device_id'];
-	        $graph_array['type']      = 'application_'.$key;
-	        $graph_array['port']      = $port['port'];
-	        $graph_array['vmid']      = $vm['vmid'];
-	        $graph_array['cluster']   = $vm['cluster'];
-	        $graph_array['hostname']  = $vm['description'];
-	
-	        echo '<h3>'.$text.' '.$port['port'].'@'.$vm['description'].'</h3>';
-	
-	        echo "<tr bgcolor='$row_colour'><td colspan=5>";
+    foreach (proxmox_node_vms(var_get('device')) as $nvm) {
+        $vm = proxmox_vm_info($nvm['vmid'], $nvm['cluster']);
 
-            include 'includes/print-graphrow.inc.php';
+        foreach ($vm['ports'] as $port) {
+            foreach ($graphs as $key => $text) {
+                $graph_type = 'proxmox_traffic';
 
-            echo '</td></tr>';
+                $graph_array['height']    = '100';
+                $graph_array['width']     = '215';
+                $graph_array['to']        = $config['time']['now'];
+                $graph_array['id']        = $vm['app_id'];
+                $graph_array['device_id'] = $vm['device_id'];
+                $graph_array['type']      = 'application_'.$key;
+                $graph_array['port']      = $port['port'];
+                $graph_array['vmid']      = $vm['vmid'];
+                $graph_array['cluster']   = $vm['cluster'];
+                $graph_array['hostname']  = $vm['description'];
+
+                echo '<h3>'.$text.' '.$port['port'].'@'.$vm['description'].'</h3>';
+
+                echo "<tr bgcolor='$row_colour'><td colspan=5>";
+
+                include 'includes/print-graphrow.inc.php';
+
+                echo '</td></tr>';
+            }
         }
     }
 }
diff --git a/includes/polling/applications/proxmox.inc.php b/includes/polling/applications/proxmox.inc.php
index 65214d229a..bb6dd95e79 100644
--- a/includes/polling/applications/proxmox.inc.php
+++ b/includes/polling/applications/proxmox.inc.php
@@ -1,21 +1,9 @@
 <?php
 
-if (!empty($agent_data['app']['proxmox'])) {
-        $proxmox = $agent_data['app']['proxmox'];
+if (isset($config['enable_proxmox']) && $config['enable_proxmox'] && !empty($agent_data['app']['proxmox'])) {
+    $proxmox = $agent_data['app']['proxmox'];
 }
 
-$pmxlines = explode("\n", $proxmox);
-$pmxcluster = array_shift($pmxlines);
-
-$pmxcdir = join('/', array($config['rrd_dir'],'proxmox',$pmxcluster));
-if (!is_dir($pmxcdir)) {
-	mkdir($pmxcdir, 0775, true);
-}
-
-dbUpdate(array('device_id' => $device['device_id'], 'app_type' => 'proxmox', 'app_instance' => $pmxcluster), 'applications', '`device_id` = ? AND `app_type` = ?', array($device['device_id'], 'proxmox'));
-
-$pmxcache = [];
-
 function proxmox_port_exists($i, $c, $p) {
     if ($row = dbFetchRow("SELECT pmp.id FROM proxmox_ports pmp, proxmox pm WHERE pm.id = pmp.vm_id AND pmp.port = ? AND pm.cluster = ? AND pm.vmid = ?", array($p, $c, $i))) {
         return $row['id'];
@@ -37,38 +25,53 @@ function proxmox_vm_exists($i, $c, &$pmxcache) {
     return false;
 }
 
-foreach ($pmxlines as $vm) {
-    list($vmid, $vmport, $vmpin, $vmpout, $vmdesc) = explode('/', $vm, 5);
+$pmxlines = explode("\n", $proxmox);
 
-    $rrd_filename = join('/', array(
-        $pmxcdir,
-        $vmid.'_netif_'.$vmport.'.rrd'));
+if (count($pmxlines) > 2) {
+    $pmxcluster = array_shift($pmxlines);
 
-    if (!is_file($rrd_filename)) {
-        rrdtool_create(
-            $rrd_filename,
-            ' --step 300 \
-            DS:INOCTETS:DERIVE:600:0:12500000000 \
-            DS:OUTOCTETS:DERIVE:600:0:12500000000 '.$config['rrd_rra']);
+    $pmxcdir = join('/', array($config['rrd_dir'],'proxmox',$pmxcluster));
+    if (!is_dir($pmxcdir)) {
+        mkdir($pmxcdir, 0775, true);
     }
 
-    rrdtool_update($rrd_filename, 'N:'.$vmpin.':'.$vmpout);
-    if (proxmox_vm_exists($vmid, $pmxcluster, $pmxcache) === true) {
-        dbUpdate(array('device_id' => $device['device_id'], 'last_seen' => array('NOW()'), 'description' => $vmdesc), 'proxmox', '`vmid` = ? AND `cluster` = ?', array($vmid, $pmxcluster));
-    } else {
-        $pmxcache[$pmxcluster][$vmid] = dbInsert(array('cluster' => $pmxcluster, 'vmid' => $vmid, 'description' => $vmdesc, 'device_id' => $device['device_id']), 'proxmox');
-    }
-
-    if ($portid = proxmox_port_exists($vmid, $pmxcluster, $vmport) !== false) {
-        dbUpdate(array('last_seen' => array('NOW()')), 'proxmox_ports', '`vm_id` = ? AND `port` = ?', array($pmxcache[$pmxcluster][$vmid], $vmport));
-    } else {
-        dbInsert(array('vm_id' => $pmxcache[$pmxcluster][$vmid], 'port' => $vmport), 'proxmox_ports');
+    dbUpdate(array('device_id' => $device['device_id'], 'app_type' => 'proxmox', 'app_instance' => $pmxcluster), 'applications', '`device_id` = ? AND `app_type` = ?', array($device['device_id'], 'proxmox'));
+
+    $pmxcache = [];
+
+    foreach ($pmxlines as $vm) {
+        list($vmid, $vmport, $vmpin, $vmpout, $vmdesc) = explode('/', $vm, 5);
+
+        $rrd_filename = join('/', array(
+            $pmxcdir,
+            $vmid.'_netif_'.$vmport.'.rrd'));
+
+        if (!is_file($rrd_filename)) {
+            rrdtool_create(
+                $rrd_filename,
+                ' --step 300 \
+                DS:INOCTETS:DERIVE:600:0:12500000000 \
+                DS:OUTOCTETS:DERIVE:600:0:12500000000 '.$config['rrd_rra']);
+        }
+
+        rrdtool_update($rrd_filename, 'N:'.$vmpin.':'.$vmpout);
+        if (proxmox_vm_exists($vmid, $pmxcluster, $pmxcache) === true) {
+            dbUpdate(array('device_id' => $device['device_id'], 'last_seen' => array('NOW()'), 'description' => $vmdesc), 'proxmox', '`vmid` = ? AND `cluster` = ?', array($vmid, $pmxcluster));
+        } else {
+            $pmxcache[$pmxcluster][$vmid] = dbInsert(array('cluster' => $pmxcluster, 'vmid' => $vmid, 'description' => $vmdesc, 'device_id' => $device['device_id']), 'proxmox');
+        }
+
+        if ($portid = proxmox_port_exists($vmid, $pmxcluster, $vmport) !== false) {
+            dbUpdate(array('last_seen' => array('NOW()')), 'proxmox_ports', '`vm_id` = ? AND `port` = ?', array($pmxcache[$pmxcluster][$vmid], $vmport));
+        } else {
+            dbInsert(array('vm_id' => $pmxcache[$pmxcluster][$vmid], 'port' => $vmport), 'proxmox_ports');
+        }
+
     }
 
+    unset($pmxlines);
+    unset($pmxcluster);
+    unset($pmxcdir);
+    unset($proxmox);
+    unset($pmxcache);
 }
-
-unset($pmxlines);
-unset($pmxcluster);
-unset($pmxcdir);
-unset($proxmox);
-unset($pmxcache);