diff --git a/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/Index.cshtml b/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/Index.cshtml
index 4984fc2..408423e 100644
--- a/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/Index.cshtml
+++ b/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/Index.cshtml
@@ -1,4 +1,6 @@
 @page
+@using Geta.Optimizely.Tags.Pages.Geta.Optimizely.Tags.Components.Pager
+@using Microsoft.AspNetCore.Mvc.TagHelpers
 @model Geta.Optimizely.Tags.Pages.Geta.Optimizely.Tags.Index
 
 <form method="get">
@@ -71,7 +73,6 @@
             }
             </tbody>
         </table>
-        @{ await Html.RenderPartialAsync("_Pager", Model.Pager); }
-        @*<vc:pager items="@Model.Items" />*@
+        @await Component.InvokeAsync(typeof(PagerViewComponent), new { Model.Items })
     </div>
 </form>
\ No newline at end of file
diff --git a/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/Index.cshtml.cs b/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/Index.cshtml.cs
index 1859384..0bfb21c 100644
--- a/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/Index.cshtml.cs
+++ b/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/Index.cshtml.cs
@@ -105,19 +105,6 @@ private void Load()
         {
             var items = FindTags().ToPagedList(Paging.PageNumber, Paging.PageSize);
             Items = items;
-            LoadPager();
-        }
-
-        private void LoadPager()
-        {
-            Pager = new PagerViewModel
-            {
-                HasPreviousPage = Items.HasPreviousPage,
-                HasNextPage = Items.HasNextPage,
-                PageNumber = Items.PageNumber,
-                PageCount = Items.PageCount,
-                QueryString = HttpContext.Request.QueryString.ToString() ?? string.Empty
-            };
         }
 
         private IEnumerable<Tag> FindTags()
diff --git a/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/_Pager.cshtml b/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/_Pager.cshtml
deleted file mode 100644
index 3de6020..0000000
--- a/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/_Pager.cshtml
+++ /dev/null
@@ -1,22 +0,0 @@
-@* TODO: Use Pager component once Optimizely fixes module loading bug *@
-@model Geta.Optimizely.Tags.Pages.Geta.Optimizely.Tags.Components.Pager.PagerViewModel
-
-<nav aria-label="Table pagination">
-    <ul class="pagination">
-        <li class="page-item @(Model.HasPreviousPage ? string.Empty : "disabled")">
-            <a class="page-link" href="?page=@Model.PageUrl(Model.PageNumber-1)" aria-label="Previous">
-                <span aria-hidden="true">&laquo;</span>
-            </a>
-        </li>
-
-        @for (int i = 1; i <= Model.PageCount; i++)
-        {
-            <li class="page-item"><a class="page-link" href="@Model.PageUrl(i)">@i</a></li>
-        }
-        <li class="page-item @(Model.HasNextPage ? string.Empty : "disabled")">
-            <a class="page-link" href="?page=@Model.PageUrl(Model.PageNumber+1)" aria-label="Next">
-                <span aria-hidden="true">&raquo;</span>
-            </a>
-        </li>
-    </ul>
-</nav>
\ No newline at end of file