diff --git a/monitorix.cgi b/monitorix.cgi
index 6496055..f92314b 100755
--- a/monitorix.cgi
+++ b/monitorix.cgi
@@ -13309,12 +13309,7 @@ sub multihost {
 	my @URL;
 	my @TEMP_LIST;
 
-	if($val eq "all") {
-		for($n = 0; $n < scalar(@REMOTEHOST_LIST); $n += 2) {
-			push(@HOST, $REMOTEHOST_LIST[$n]);
-			push(@URL, $REMOTEHOST_LIST[$n + 1]);
-		}
-	} else {
+	if($val =~ m/group[0-9]*/) {
 		$gnum = substr($val, 5, length($val));
 		@TEMP_LIST = split(':', $REMOTEGROUP_LIST[2 * $gnum + 1]);
 		$gnum = scalar(@TEMP_LIST);
@@ -13327,6 +13322,11 @@ sub multihost {
 				}
 			}
 		}
+	} else {
+		for($n = 0; $n < scalar(@REMOTEHOST_LIST); $n += 2) {
+			push(@HOST, $REMOTEHOST_LIST[$n]);
+			push(@URL, $REMOTEHOST_LIST[$n + 1]);
+		}
 	}
 
 	$MULTIHOST_IMGS_PER_ROW = 1 unless $MULTIHOST_IMGS_PER_ROW > 1;