Adding a fix for when the client table is empty