diff --git a/src/Raven.Studio/typescript/models/database/documents/revisionsConfigurationEntry.ts b/src/Raven.Studio/typescript/models/database/documents/revisionsConfigurationEntry.ts
index 22389bf45d9..b5c9af67c24 100644
--- a/src/Raven.Studio/typescript/models/database/documents/revisionsConfigurationEntry.ts
+++ b/src/Raven.Studio/typescript/models/database/documents/revisionsConfigurationEntry.ts
@@ -244,7 +244,7 @@ class revisionsConfigurationEntry {
         return new revisionsConfigurationEntry("",
         {
             Disabled: false,
-            MinimumRevisionsToKeep: null,
+            MinimumRevisionsToKeep: 1000,
             MinimumRevisionAgeToKeep: null,
             MaximumRevisionsToDeleteUponDocumentUpdate: null,
             PurgeOnDelete: false
diff --git a/src/Raven.Studio/wwwroot/App/views/database/settings/revisions.html b/src/Raven.Studio/wwwroot/App/views/database/settings/revisions.html
index e5df962e815..ebba52600ee 100644
--- a/src/Raven.Studio/wwwroot/App/views/database/settings/revisions.html
+++ b/src/Raven.Studio/wwwroot/App/views/database/settings/revisions.html
@@ -170,6 +170,16 @@ <h3 data-bind="text: isDefault() ? 'Default Document Revisions' : (isConflicts()
                     <div class="bg-info padding padding-xs margin-top small" data-bind="visible: humaneRetentionDescription">
                         <div data-bind="html: humaneRetentionDescription"></div>
                     </div>
+                    
+                    <div class="bg-warning padding margin-top small flex-horizontal" data-bind="visible: !limitRevisions()">
+                        <div class="flex-start text-warning">
+                            <i class="icon-warning"></i>
+                        </div>
+                        <div>
+                            No limit has been set on the number of revisions to keep.<br />
+                            An excessive number of revisions will lead to increased storage usage and may affect system performance.
+                        </div>
+                    </div>
                     <hr>
                     <div class="text-right margin-top">
                         <button class="btn btn-default" data-bind="click: $root.exitEditMode"><i class="icon-cancel"></i><span>Cancel</span></button>