diff --git a/components/fpspreadsheet/wikitable.pas b/components/fpspreadsheet/wikitable.pas
index 2523d96e2..aa77478b1 100644
--- a/components/fpspreadsheet/wikitable.pas
+++ b/components/fpspreadsheet/wikitable.pas
@@ -56,6 +56,15 @@ type
     procedure TokenizeString_Pipes(AStr: string);
   end;
 
+  { TsWikiTableNumFormatList }
+  TsWikiTableNumFormatList = class(TsCustomNumFormatList)
+  protected
+    //procedure AddBuiltinFormats; override;
+  public
+//    function FormatStringForWriting(AIndex: Integer): String; override;
+  end;
+
+
   { TsWikiTableReader }
 
   TsWikiTableReader = class(TsCustomSpreadReader)
@@ -78,6 +87,9 @@ type
   TsWikiTableWriter = class(TsCustomSpreadWriter)
   private
     FWorksheet: TsWorksheet;
+  protected
+    // Helpers
+    procedure CreateNumFormatList; override;
   public
     SubFormat: TsSpreadsheetFormat;
     { General writing methods }
@@ -94,6 +106,9 @@ type
 
 implementation
 
+{ TsWikiTableNumFormatList }
+
+
 { TWikiTableTokenizer }
 
 constructor TWikiTableTokenizer.Create;
@@ -326,6 +341,12 @@ end;
 
 { TsWikiTableWriter }
 
+procedure TsWikiTableWriter.CreateNumFormatList;
+begin
+  FreeAndNil(FNumFormatList);
+  FNumFormatList := TsWikiTableNumFormatList.Create;
+end;
+
 procedure TsWikiTableWriter.WriteToStrings(AStrings: TStrings);
 begin
   case SubFormat of