Merge branch 'master' into authentication

1 files changed, 2 insertions, 1 deletions

diff --git a/src/client/Server.ts b/src/client/Server.ts
index 5e42c8285..3fb1ae878 100644
--- a/src/client/Server.ts
+++ b/src/client/Server.ts
@@ -56,6 +56,7 @@ export class Server {
             let field = this.ClientFieldsCached.get(id);
             if (!field) {
                 neededFieldIds.push(id);
+                this.ClientFieldsCached.set(id, FieldWaiting);
             } else if (field === FieldWaiting) {
                 waitingFieldIds.push(id);
             } else {
@@ -65,7 +66,7 @@ export class Server {
         SocketStub.SEND_FIELDS_REQUEST(neededFieldIds, (fields) => {
             for (let key in fields) {
                 let field = fields[key];
-                if (!this.ClientFieldsCached.has(field.Id)) {
+                if (!(this.ClientFieldsCached.get(field.Id) instanceof Field)) {
                     this.ClientFieldsCached.set(field.Id, field)
                 }
             }