diff --git a/RMuseum/Models/Ganjoor/ViewModels/GanjoorUserPrePoemVisitViewModel.cs b/RMuseum/Models/Ganjoor/ViewModels/GanjoorUserPrePoemVisitViewModel.cs
index 2a656094..8d420767 100644
--- a/RMuseum/Models/Ganjoor/ViewModels/GanjoorUserPrePoemVisitViewModel.cs
+++ b/RMuseum/Models/Ganjoor/ViewModels/GanjoorUserPrePoemVisitViewModel.cs
@@ -6,5 +6,6 @@ namespace RMuseum.Models.Ganjoor.ViewModels
     {
         public DateTime? LastVisit { get; set; }
         public int TotalVisits { get; set; }
+        public bool KeepTrack { get; set; }
     }
 }
diff --git a/RMuseum/RMuseum.xml b/RMuseum/RMuseum.xml
index a14c6797..972f141a 100644
--- a/RMuseum/RMuseum.xml
+++ b/RMuseum/RMuseum.xml
@@ -4555,6 +4555,18 @@
         <member name="M:RMuseum.Migrations.RemTrans.BuildTargetModel(Microsoft.EntityFrameworkCore.ModelBuilder)">
             <inheritdoc />
         </member>
+        <member name="T:RMuseum.Migrations.UsrHstryCntr">
+            <inheritdoc />
+        </member>
+        <member name="M:RMuseum.Migrations.UsrHstryCntr.Up(Microsoft.EntityFrameworkCore.Migrations.MigrationBuilder)">
+            <inheritdoc />
+        </member>
+        <member name="M:RMuseum.Migrations.UsrHstryCntr.Down(Microsoft.EntityFrameworkCore.Migrations.MigrationBuilder)">
+            <inheritdoc />
+        </member>
+        <member name="M:RMuseum.Migrations.UsrHstryCntr.BuildTargetModel(Microsoft.EntityFrameworkCore.ModelBuilder)">
+            <inheritdoc />
+        </member>
         <member name="T:RMuseum.Models.Accounting.DonationExpenditure">
             <summary>
             donation expenditures
diff --git a/RMuseum/Services/Implementation/UserVisitsTrackingService.cs b/RMuseum/Services/Implementation/UserVisitsTrackingService.cs
index 18558a97..0a3a6e38 100644
--- a/RMuseum/Services/Implementation/UserVisitsTrackingService.cs
+++ b/RMuseum/Services/Implementation/UserVisitsTrackingService.cs
@@ -30,7 +30,12 @@ namespace RMuseum.Services.Implementation
             if (!string.IsNullOrEmpty(kRes.Result))
                 bool.TryParse(kRes.Result, out keepHistory);
             if (!keepHistory)
-                return new RServiceResult<GanjoorUserPrePoemVisitViewModel>(null);
+                return new RServiceResult<GanjoorUserPrePoemVisitViewModel>(new GanjoorUserPrePoemVisitViewModel()
+                {
+                    LastVisit = null,
+                    TotalVisits = 0,
+                    KeepTrack = keepHistory,
+                });
 
             
             var oldTracks = await _context.GanjoorUserPoemVisits.Where(v => v.PoemId == poemId && v.UserId == userId).ToArrayAsync();
@@ -58,6 +63,7 @@ namespace RMuseum.Services.Implementation
                 {
                     LastVisit = preVisit,
                     TotalVisits = count,
+                    KeepTrack= keepHistory,
                 }
                 );
         }