diff --git a/DNN Platform/DotNetNuke.Web/InternalServices/SearchServiceController.cs b/DNN Platform/DotNetNuke.Web/InternalServices/SearchServiceController.cs
index 1d738dbb1a9..f07fb81e33e 100644
--- a/DNN Platform/DotNetNuke.Web/InternalServices/SearchServiceController.cs	
+++ b/DNN Platform/DotNetNuke.Web/InternalServices/SearchServiceController.cs	
@@ -18,6 +18,7 @@ namespace DotNetNuke.Web.InternalServices
     using DotNetNuke.Common;
     using DotNetNuke.Common.Utilities;
     using DotNetNuke.Data;
+    using DotNetNuke.Entities.Controllers;
     using DotNetNuke.Entities.Modules;
     using DotNetNuke.Entities.Modules.Definitions;
     using DotNetNuke.Entities.Tabs;
@@ -37,7 +38,6 @@ public class SearchServiceController : DnnApiController
         private const string ModuleTitleCacheKey = "SearchModuleTabTitle_{0}";
         private const CacheItemPriority ModuleTitleCachePriority = CacheItemPriority.Normal;
         private const int ModuleTitleCacheTimeOut = 20;
-
         private static readonly Regex GroupedBasicViewRegex = new Regex("userid(/|\\|=)(\\d+)", RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
         private int htmlModuleDefitionId;
@@ -125,6 +125,7 @@ public HttpResponseMessage Search(string search, string culture, int pageIndex,
             var moduleDefids = GetSearchModuleDefIds(settings, contentSources);
             var portalIds = this.GetSearchPortalIds(settings, -1);
             var userSearchTypeId = SearchHelper.Instance.GetSearchTypeByName("user").SearchTypeId;
+            var maximumPageSize = HostController.Instance.GetInteger("Search_MaxResultPerPage", 100);
 
             var more = false;
             var totalHits = 0;
@@ -132,6 +133,11 @@ public HttpResponseMessage Search(string search, string culture, int pageIndex,
             if (portalIds.Any() && searchTypeIds.Any() &&
                 (!string.IsNullOrEmpty(cleanedKeywords) || tags.Any()))
             {
+                if (pageSize > maximumPageSize)
+                {
+                    pageSize = maximumPageSize;
+                }
+
                 var query = new SearchQuery
                 {
                     KeyWords = cleanedKeywords,
diff --git a/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/basicSearchSettings/index.jsx b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/basicSearchSettings/index.jsx
index 46b711a329e..796c26cfc2f 100644
--- a/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/basicSearchSettings/index.jsx
+++ b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/basicSearchSettings/index.jsx
@@ -21,7 +21,8 @@ class BasicSearchSettingsPanelBody extends Component {
             basicSearchSettings: undefined,
             error: {
                 minlength: false,
-                maxlength: false
+                maxlength: false,
+                maxresult: false
             },
             triedToSubmit: false
         };
@@ -72,6 +73,13 @@ class BasicSearchSettingsPanelBody extends Component {
             error["minlength"] = false;
         }
 
+        if (!re.test(basicSearchSettings[key]) && key === "MaxResultPerPage") {
+            error["maxresult"] = true;
+        }
+        else if (re.test(basicSearchSettings[key]) && key === "MaxResultPerPage") {
+            error["maxresult"] = false;
+        }
+
         if (key === "MaxWordLength" && (!re.test(basicSearchSettings[key])
             || parseInt(basicSearchSettings["MinWordLength"]) >= parseInt(basicSearchSettings["MaxWordLength"]))) {
             error["maxlength"] = true;
@@ -153,50 +161,94 @@ class BasicSearchSettingsPanelBody extends Component {
         const {state} = this;
         if (this.isHost()) {
             if (state.basicSearchSettings) {
-                const columnOne = <div className="left-column" key="columnOneSearchSettingsPanel">
-                    <InputGroup>
-                        <Label
-                            tooltipMessage={resx.get("lblIndexWordMinLength.Help")}
-                            label={resx.get("lblIndexWordMinLength")}
-                            extra={
-                                <Tooltip
-                                    messages={[resx.get("GlobalSetting")]}
-                                    type="global"
-                                    style={{ float: "left", position: "static" }}
-                                />}
-                        />
-                        <SingleLineInputWithError
-                            inputStyle={{ margin: "0" }}
-                            withLabel={false}
-                            error={state.error.minlength && state.triedToSubmit}
-                            errorMessage={resx.get("valIndexWordMinLengthRequired.Error")}
-                            value={state.basicSearchSettings.MinWordLength}
-                            onChange={this.onSettingChange.bind(this, "MinWordLength")}
-                            style={{ width: "100%" }}
-                        />
-                    </InputGroup>
-                    <InputGroup>
-                        <Label
-                            tooltipMessage={resx.get("lblIndexWordMaxLength.Help")}
-                            label={resx.get("lblIndexWordMaxLength")}
-                            extra={
-                                <Tooltip
-                                    messages={[resx.get("GlobalSetting")]}
-                                    type="global"
-                                    style={{ float: "left", position: "static" }}
-                                />}
-                        />
-                        <SingleLineInputWithError
-                            inputStyle={{ margin: "0" }}
-                            withLabel={false}
-                            error={state.error.maxlength && state.triedToSubmit}
-                            errorMessage={resx.get("valIndexWordMaxLengthRequired.Error")}
-                            value={state.basicSearchSettings.MaxWordLength}
-                            onChange={this.onSettingChange.bind(this, "MaxWordLength")}
-                            style={{ width: "100%" }}
-                        />
-                    </InputGroup>
-                </div>;
+                const columnOne = (
+                    <div
+                        className="left-column"
+                        key="columnOneSearchSettingsPanel"
+                    >
+                        <InputGroup>
+                            <Label
+                                tooltipMessage={resx.get("lblIndexWordMinLength.Help")}
+                                label={resx.get("lblIndexWordMinLength")}
+                                extra={
+                                    <Tooltip
+                                        messages={[resx.get("GlobalSetting")]}
+                                        type="global"
+                                        style={{ float: "left", position: "static" }}
+                                    />
+                                }
+                            />
+                            <SingleLineInputWithError
+                                inputStyle={{ margin: "0" }}
+                                withLabel={false}
+                                error={state.error.minlength && state.triedToSubmit}
+                                errorMessage={resx.get(
+                                    "valIndexWordMinLengthRequired.Error"
+                                )}
+                                value={state.basicSearchSettings.MinWordLength}
+                                onChange={this.onSettingChange.bind(
+                                    this,
+                                    "MinWordLength"
+                                )}
+                                style={{ width: "100%" }}
+                            />
+                        </InputGroup>
+                        <InputGroup>
+                            <Label
+                                tooltipMessage={resx.get("lblIndexWordMaxLength.Help")}
+                                label={resx.get("lblIndexWordMaxLength")}
+                                extra={
+                                    <Tooltip
+                                        messages={[resx.get("GlobalSetting")]}
+                                        type="global"
+                                        style={{ float: "left", position: "static" }}
+                                    />
+                                }
+                            />
+                            <SingleLineInputWithError
+                                inputStyle={{ margin: "0" }}
+                                withLabel={false}
+                                error={state.error.maxlength && state.triedToSubmit}
+                                errorMessage={resx.get(
+                                    "valIndexWordMaxLengthRequired.Error"
+                                )}
+                                value={state.basicSearchSettings.MaxWordLength}
+                                onChange={this.onSettingChange.bind(
+                                    this,
+                                    "MaxWordLength"
+                                )}
+                                style={{ width: "100%" }}
+                            />
+                        </InputGroup>
+                        <InputGroup>
+                            <Label
+                                tooltipMessage={resx.get("lblMaxResultPerPage.Help")}
+                                label={resx.get("lblMaxResultPerPage")}
+                                extra={
+                                    <Tooltip
+                                        messages={[resx.get("GlobalSetting")]}
+                                        type="global"
+                                        style={{ float: "left", position: "static" }}
+                                    />
+                                }
+                            />
+                            <SingleLineInputWithError
+                                inputStyle={{ margin: "0" }}
+                                withLabel={false}
+                                error={state.error.maxresult && state.triedToSubmit}
+                                errorMessage={resx.get(
+                                    "valMaxResultPerPageRequired.Error"
+                                )}
+                                value={state.basicSearchSettings.MaxResultPerPage}
+                                onChange={this.onSettingChange.bind(
+                                    this,
+                                    "MaxResultPerPage"
+                                )}
+                                style={{ width: "100%" }}
+                            />
+                        </InputGroup>
+                    </div>
+                );
                 const columnTwo = <div className="right-column" key="columnTwoSearchSettingsPanel">
                     <DropdownWithError
                         style={{ maxWidth: "100%" }}
diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateBasicSearchSettingsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateBasicSearchSettingsRequest.cs
index 662328e98c5..8805880bbc1 100644
--- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateBasicSearchSettingsRequest.cs
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateBasicSearchSettingsRequest.cs
@@ -9,8 +9,10 @@ public class UpdateBasicSearchSettingsRequest
     {
         public int MinWordLength { get; set; }
 
-        public int MaxWordLength { get; set; }
-
+        public int MaxWordLength { get; set; }
+
+        public int MaxResultPerPage { get; set; }
+
         public bool AllowLeadingWildcard { get; set; }
 
         public string SearchCustomAnalyzer { get; set; }
diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SiteSettingsController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SiteSettingsController.cs
index c435407fd5e..9fe8d14ad1e 100644
--- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SiteSettingsController.cs
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SiteSettingsController.cs
@@ -1659,6 +1659,7 @@ public HttpResponseMessage GetBasicSearchSettings()
                 settings.DescriptionBoost = HostController.Instance.GetInteger(SearchDescriptionBoostSetting, DefaultSearchDescriptionBoost);
                 settings.AuthorBoost = HostController.Instance.GetInteger(SearchAuthorBoostSetting, DefaultSearchAuthorBoost);
                 settings.SearchIndexPath = Path.Combine(Globals.ApplicationMapPath, HostController.Instance.GetString("SearchFolder", @"App_Data\Search"));
+                settings.MaxResultPerPage = HostController.Instance.GetInteger("Search_MaxResultPerPage", 100);
 
                 SearchStatistics searchStatistics = this.GetSearchStatistics();
                 if (searchStatistics != null)
@@ -1714,12 +1715,25 @@ public HttpResponseMessage UpdateBasicSearchSettings(UpdateBasicSearchSettingsRe
                         string.Format(Localization.GetString("valIndexWordMaxLengthRequired.Error", Components.Constants.Constants.LocalResourcesFile)));
                 }
 
+                if (request.MaxResultPerPage == Null.NullInteger || request.MaxResultPerPage == 0)
+                {
+                    return this.Request.CreateErrorResponse(
+                        HttpStatusCode.BadRequest,
+                        string.Format(Localization.GetString("valMaxResultPerPageRequired.Error", Components.Constants.Constants.LocalResourcesFile)));
+                }
+
                 var oldMinLength = HostController.Instance.GetInteger("Search_MinKeyWordLength", 3);
                 if (request.MinWordLength != oldMinLength)
                 {
                     HostController.Instance.Update("Search_MinKeyWordLength", request.MinWordLength.ToString());
                 }
 
+                var oldMaxResultPerPage = HostController.Instance.GetInteger("Search_MaxResultPerPage", 100);
+                if (request.MaxResultPerPage != oldMaxResultPerPage)
+                {
+                    HostController.Instance.Update("Search_MaxResultPerPage", request.MaxResultPerPage.ToString());
+                }
+
                 var oldMaxLength = HostController.Instance.GetInteger("Search_MaxKeyWordLength", 255);
                 if (request.MaxWordLength != oldMaxLength)
                 {
diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/App_LocalResources/SiteSettings.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/App_LocalResources/SiteSettings.resx
index 75c8a6534c8..529b9880305 100644
--- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/App_LocalResources/SiteSettings.resx
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/App_LocalResources/SiteSettings.resx
@@ -1500,4 +1500,13 @@
   <data name="plShowQuickModuleAddMenu.Text" xml:space="preserve">
     <value>Show Quick Module Add Menu</value>
   </data>
-</root>
+  <data name="lblMaxResultPerPage" xml:space="preserve">
+    <value>Maximum Result Per Page</value>
+  </data>
+  <data name="lblMaxResultPerPage.Help" xml:space="preserve">
+    <value>Maximum result per page in search service</value>
+  </data>
+  <data name="valMaxResultPerPageRequired.Error" xml:space="preserve">
+    <value>Maximum result per page is required. Integer must be greater than 0.</value>
+  </data>
+</root>
\ No newline at end of file