diff --git a/Lib/Protocols/IdFTPServer.pas b/Lib/Protocols/IdFTPServer.pas
index 14bed6927..c7750a4cd 100644
--- a/Lib/Protocols/IdFTPServer.pas
+++ b/Lib/Protocols/IdFTPServer.pas
@@ -2472,7 +2472,6 @@ procedure TIdFTPServer.ContextCreated(AContext: TIdContext);
   LContext : TIdFTPServerContext;
 begin
   LContext := (AContext as TIdFTPServerContext);
-  LContext.Server := Self;
   //from Before run method
   LContext.FDataPort := 0;
   LContext.FPasswordAttempts := 0;
@@ -2516,6 +2515,7 @@ procedure TIdFTPServer.ContextCreated(AContext: TIdContext);
   if FDirFormat = ftpdfDOS then begin
     LContext.FMSDOSMode := True;
   end;
+  inherited ContextCreated(AContext);
 end;
 
 destructor TIdFTPServer.Destroy;
diff --git a/Lib/Protocols/IdMappedPortTCP.pas b/Lib/Protocols/IdMappedPortTCP.pas
index bbab38eba..3d10b1210 100644
--- a/Lib/Protocols/IdMappedPortTCP.pas
+++ b/Lib/Protocols/IdMappedPortTCP.pas
@@ -166,7 +166,6 @@   TIdMappedPortTCP = class(TIdCustomTCPServer)
     FOnOutboundData: TIdServerThreadEvent;
     FOnOutboundDisConnect: TIdServerThreadEvent;
     //
-    procedure ContextCreated(AContext:TIdContext); override;
     procedure DoBeforeConnect(AContext: TIdContext); virtual;
     procedure DoConnect(AContext: TIdContext); override;
     function  DoExecute(AContext: TIdContext): boolean; override;
@@ -211,11 +210,6 @@ procedure TIdMappedPortTCP.InitComponent;
   FContextClass := TIdMappedPortContext;
 end;
 
-procedure TIdMappedPortTCP.ContextCreated(AContext: TIdContext);
-begin
-  TIdMappedPortContext(AContext).Server := Self;
-end;
-
 procedure TIdMappedPortTCP.DoBeforeConnect(AContext: TIdContext);
 begin
   if Assigned(FOnBeforeConnect) then begin