diff --git a/code/gamespy/gserverlist.c b/code/gamespy/gserverlist.c
index 9ebc07d5..8da63e2b 100644
--- a/code/gamespy/gserverlist.c
+++ b/code/gamespy/gserverlist.c
@@ -530,7 +530,11 @@ GError ServerListUpdate2(GServerList serverlist, gbool async, char *filter, GQue
     serverlist->numservers = ServerListCount(serverlist);
     // Added in 2.0
     //serverlist->cryptinfo.offset = -1;
-    strncpy(serverlist->filter, filter, sizeof(serverlist->filter));
+    if (filter) {
+        strncpy(serverlist->filter, filter, sizeof(serverlist->filter));
+    } else {
+        serverlist->filter[0] = 0;
+    }
 
     serverlist->async = async;