diff --git a/web/includes/functions.php b/web/includes/functions.php
index 1374239c0..de3141a74 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -962,7 +962,7 @@ function daemonControl( $command, $daemon=false, $args=false )
 
 function zmcControl( $monitor, $mode=false )
 {
-  if ( (!ZM_SERVER) or ( ZM_SERVER==$monitor['ServerId'] ) ) {
+  if ( (!defined('ZM_SERVER_ID')) or ( ZM_SERVER_ID==$monitor['ServerId'] ) ) {
 	$row = NULL;
     if ( $monitor['Type'] == "Local" )
     {
@@ -993,7 +993,7 @@ function zmcControl( $monitor, $mode=false )
 
 function zmaControl( $monitor, $mode=false )
 {
-  if ( (!ZM_SERVER) or ( ZM_SERVER==$monitor['ServerId'] ) ) {
+  if ( (!defined('ZM_SERVER_ID')) or ( ZM_SERVER_ID==$monitor['ServerId'] ) ) {
     if ( !is_array( $monitor ) )
     {
       $monitor = dbFetchOne( "select C.*, M.* from Monitors as M left join Controls as C on (M.ControlId = C.Id ) where M.Id=?", NULL, array($monitor) );