diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
index 62a55b444..1443a3a2a 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
@@ -236,7 +236,11 @@ sub Sql {
               $value = '(SELECT * FROM Stats WHERE EventId=E.Id AND Score > 0 AND ZoneId='.$value.')';
             } elsif ( $term->{attr} =~ /^MonitorName/ ) {
               $value = "'$temp_value'";
-            } elsif ( $term->{attr} eq 'ServerId' or $term->{attr} eq 'MonitorServerId' or $term->{attr} eq 'FilterServerId' ) {
+            } elsif (
+              $term->{attr} eq 'ServerId' or
+              $term->{attr} eq 'MonitorServerId' or
+              $term->{attr} eq 'StorageServerId' or
+              $term->{attr} eq 'FilterServerId' ) {
               if ( $temp_value eq 'ZM_SERVER_ID' ) {
                 $value = "'$ZoneMinder::Config::Config{ZM_SERVER_ID}'";
                 # This gets used later, I forget for what