diff --git a/src/System Application/App/Word Templates/src/WordTemplatesRelatedPart.Page.al b/src/System Application/App/Word Templates/src/WordTemplatesRelatedPart.Page.al
index fd315958dd..61ab7259f3 100644
--- a/src/System Application/App/Word Templates/src/WordTemplatesRelatedPart.Page.al	
+++ b/src/System Application/App/Word Templates/src/WordTemplatesRelatedPart.Page.al	
@@ -73,7 +73,6 @@ page 9987 "Word Templates Related Part"
                         WordTemplateFieldSelection.ShowFieldSelection(Rec."Related Table ID", TempWordTemplateField);
                         NumberOfSelectedFields := WordTemplateFieldSelection.CalculateNoSelectedFields(Rec."Related Table ID", TempWordTemplateField);
                         SelectedFieldsCount.Set(Rec."Related Table ID", NumberOfSelectedFields);
-                        CalculateSelectedFields();
                     end;
                 }
                 field("Entity Relation"; RecordTypeTxt)
@@ -200,6 +199,8 @@ page 9987 "Word Templates Related Part"
         TempWordTemplateField.Reset();
         TempWordTemplateField.SetRange("Table ID", Rec."Related Table ID");
         TempWordTemplateField.DeleteAll();
+
+        SelectedFieldsCount.Remove(Rec."Related Table ID");
     end;
 
     internal procedure AddRelatedTable(TableId: Integer)