diff --git a/amnet-native/app/ServerManager.tsx b/amnet-native/app/ServerManager.tsx
index 0fca8f2..4eeba7c 100644
--- a/amnet-native/app/ServerManager.tsx
+++ b/amnet-native/app/ServerManager.tsx
@@ -89,8 +89,8 @@ export default function ServerManager({navigation}) {
     if (!servers.length) {
         return (
             <View style={{gap: 10, flex: 1, justifyContent: "center", alignItems: "center"}}>
-                <EmptyStatePlaceholder message="No servers found" icon={<ServerOff color="gray"/>}/> 
-                <Button mode="text" onPress={() => navigation.navigate('add-server')} icon={() => <Plus size={18} color={theme.colors.primary}/>}>Add Server</Button>
+                <EmptyStatePlaceholder message="No servers found" icon={<ServerOff color="gray"/>}/>
+                {(!searchQuery || !query.length) && (<Button mode="text" onPress={() => navigation.navigate('add-server')} icon={() => <Plus size={18} color={theme.colors.primary}/>}>Add Server</Button>)}
             </View>
         );
     }