diff --git a/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml b/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml
index 2a973f67..57d04b46 100644
--- a/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml
+++ b/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml
@@ -521,10 +521,10 @@ else
             </tr>
             <tr>
                 <td>
-                    <p id="original-poemformat" class="red-color">@RMuseum.Services.Implementation.GanjoorPoemFormatConvertor.GetString((RMuseum.Models.Ganjoor.GanjoorPoemFormat?)Model.Correction.OriginalPoemFormat)</p>
+                    <p id="original-poemformat" class="red-color">@RMuseum.Services.Implementation.GanjoorPoemFormatConvertor.GetString(Model.Correction.OriginalPoemFormat)</p>
                 </td>
                 <td>
-                    <p id="edited-poemformat" class="green-color">@RMuseum.Services.Implementation.GanjoorPoemFormatConvertor.GetString((RMuseum.Models.Ganjoor.GanjoorPoemFormat?)Model.Correction.PoemFormat)</p>
+                    <p id="edited-poemformat" class="green-color">@RMuseum.Services.Implementation.GanjoorPoemFormatConvertor.GetString(Model.Correction.PoemFormat)</p>
                 </td>
             </tr>
 
diff --git a/GanjooRazor/Areas/Admin/Pages/ReviewPartEdits.cshtml b/GanjooRazor/Areas/Admin/Pages/ReviewPartEdits.cshtml
index 17cf0a9c..f146bf1f 100644
--- a/GanjooRazor/Areas/Admin/Pages/ReviewPartEdits.cshtml
+++ b/GanjooRazor/Areas/Admin/Pages/ReviewPartEdits.cshtml
@@ -497,10 +497,10 @@ else
             </tr>
             <tr>
                 <td>
-                    <p id="original-poemformat" class="red-color">@RMuseum.Services.Implementation.GanjoorPoemFormatConvertor.GetString((RMuseum.Models.Ganjoor.GanjoorPoemFormat?)Model.Correction.OriginalPoemFormat)</p>
+                    <p id="original-poemformat" class="red-color">@RMuseum.Services.Implementation.GanjoorPoemFormatConvertor.GetString(Model.Correction.OriginalPoemFormat)</p>
                 </td>
                 <td>
-                    <p id="edited-poemformat" class="green-color">@RMuseum.Services.Implementation.GanjoorPoemFormatConvertor.GetString((RMuseum.Models.Ganjoor.GanjoorPoemFormat?)Model.Correction.PoemFormat)</p>
+                    <p id="edited-poemformat" class="green-color">@RMuseum.Services.Implementation.GanjoorPoemFormatConvertor.GetString(Model.Correction.PoemFormat)</p>
                 </td>
             </tr>
 
diff --git a/GanjooRazor/Areas/User/Pages/Editor.cshtml b/GanjooRazor/Areas/User/Pages/Editor.cshtml
index 781c0f00..09bb1661 100644
--- a/GanjooRazor/Areas/User/Pages/Editor.cshtml
+++ b/GanjooRazor/Areas/User/Pages/Editor.cshtml
@@ -520,10 +520,10 @@ else
                 </tr>
                 <tr>
                     <td>
-                        <p class="red-color"> @RMuseum.Services.Implementation.GanjoorPoemFormatConvertor.GetString((RMuseum.Models.Ganjoor.GanjoorPoemFormat?)Model.MyLastEdit.OriginalPoemFormat)</p>
+                        <p class="red-color"> @RMuseum.Services.Implementation.GanjoorPoemFormatConvertor.GetString(Model.MyLastEdit.OriginalPoemFormat)</p>
                     </td>
                     <td>
-                        <p class="green-color"> @RMuseum.Services.Implementation.GanjoorPoemFormatConvertor.GetString((RMuseum.Models.Ganjoor.GanjoorPoemFormat?)Model.MyLastEdit.PoemFormat)</p>
+                        <p class="green-color"> @RMuseum.Services.Implementation.GanjoorPoemFormatConvertor.GetString(Model.MyLastEdit.PoemFormat)</p>
                     </td>
                 </tr>
             }
@@ -1254,7 +1254,7 @@ else
 
             <tr>
                 <td>
-                    @RMuseum.Services.Implementation.GanjoorPoemFormatConvertor.GetString((RMuseum.Models.Ganjoor.GanjoorPoemFormat)Model.PoemFormat)
+                    @RMuseum.Services.Implementation.GanjoorPoemFormatConvertor.GetString(Model.PoemFormat)
                     <div id="poemformat-old" class="hidden-recitation">@Model.PoemFormat</div>
                 </td>
             </tr>
diff --git a/GanjooRazor/Areas/User/Pages/Editor.cshtml.cs b/GanjooRazor/Areas/User/Pages/Editor.cshtml.cs
index ac79e70b..2a540b07 100644
--- a/GanjooRazor/Areas/User/Pages/Editor.cshtml.cs
+++ b/GanjooRazor/Areas/User/Pages/Editor.cshtml.cs
@@ -210,6 +210,10 @@ namespace GanjooRazor.Areas.User.Pages
                     {
                         PoemFormat = PageInformation.Poem.Sections.Where(s => s.SectionType == PoemSectionType.WholePoem && s.PoemFormat != null).OrderBy(s => s.VerseType).First().PoemFormat;
                     }
+                    else
+                    {
+                        PoemFormat = GanjoorPoemFormat.Unknown;
+                    }
 
                     if (PageInformation.Poem.Images.Where(i => i.IsTextOriginalSource).Any())
                     {
diff --git a/GanjooRazor/Areas/User/Pages/SectionEdits.cshtml b/GanjooRazor/Areas/User/Pages/SectionEdits.cshtml
index 47659fa1..2808ad3b 100644
--- a/GanjooRazor/Areas/User/Pages/SectionEdits.cshtml
+++ b/GanjooRazor/Areas/User/Pages/SectionEdits.cshtml
@@ -182,10 +182,10 @@ else
                 {
                     <tr>
                         <td>
-                            <p style="color:red">قالب شعری: @RMuseum.Services.Implementation.GanjoorPoemFormatConvertor.GetString((RMuseum.Models.Ganjoor.GanjoorPoemFormat?)correction.OriginalPoemFormat)</p>
+                            <p style="color:red">قالب شعری: @RMuseum.Services.Implementation.GanjoorPoemFormatConvertor.GetString(correction.OriginalPoemFormat)</p>
                         </td>
                         <td>
-                            <p style="color:green">@RMuseum.Services.Implementation.GanjoorPoemFormatConvertor.GetString((RMuseum.Models.Ganjoor.GanjoorPoemFormat?)correction.PoemFormat)</p>
+                            <p style="color:green">@RMuseum.Services.Implementation.GanjoorPoemFormatConvertor.GetString(correction.PoemFormat)</p>
                         </td>
                         <td>
                             @if (correction.PoemFormatReviewResult == CorrectionReviewResult.NotReviewed)