diff --git a/src/plugins/data/server/saved_objects/query.ts b/src/plugins/data/server/saved_objects/query.ts
index 7470960debec6..0e11bf7a9f2e0 100644
--- a/src/plugins/data/server/saved_objects/query.ts
+++ b/src/plugins/data/server/saved_objects/query.ts
@@ -33,8 +33,7 @@ export const querySavedObjectType: SavedObjectsType = {
       title: { type: 'text' },
       description: { type: 'text' },
       query: {
-        dynamic: false,
-        properties: { language: { type: 'keyword' }, query: { type: 'keyword', index: false } }, // cannot remove, query.query is used in the UI & for validation on create
+        properties: { language: { type: 'keyword' }, query: { type: 'keyword', index: false } },
       },
       filters: {
         dynamic: false,
diff --git a/src/plugins/saved_search/server/saved_objects/search.ts b/src/plugins/saved_search/server/saved_objects/search.ts
index 83923df21480f..904751ed05c53 100644
--- a/src/plugins/saved_search/server/saved_objects/search.ts
+++ b/src/plugins/saved_search/server/saved_objects/search.ts
@@ -33,6 +33,7 @@ export function getSavedSearchObjectType(
       },
     },
     mappings: {
+      dynamic: false,
       properties: {
         columns: { type: 'keyword', index: false, doc_values: false },
         description: { type: 'text' },
@@ -43,31 +44,33 @@ export function getSavedSearchObjectType(
         hideAggregatedPreview: { type: 'boolean', index: false, doc_values: false },
         hits: { type: 'integer', index: false, doc_values: false },
         kibanaSavedObjectMeta: {
+          dynamic: false,
           properties: {
+            // may need code changes
             searchSourceJSON: { type: 'text', index: false },
           },
         },
-        sort: { type: 'keyword', index: false, doc_values: false },
+        // sort: { type: 'keyword', index: false, doc_values: false },
         title: { type: 'text' },
         grid: { dynamic: false, properties: {} },
         version: { type: 'integer' },
         rowHeight: { type: 'text' },
-        timeRestore: { type: 'boolean', index: false, doc_values: false },
+        // timeRestore: { type: 'boolean', index: false, doc_values: false },
         timeRange: {
           dynamic: false,
           properties: {
-            from: { type: 'keyword', index: false, doc_values: false },
-            to: { type: 'keyword', index: false, doc_values: false },
+            // from: { type: 'keyword', index: false, doc_values: false },
+            // to: { type: 'keyword', index: false, doc_values: false },
           },
         },
         refreshInterval: {
           dynamic: false,
           properties: {
-            pause: { type: 'boolean', index: false, doc_values: false },
-            value: { type: 'integer', index: false, doc_values: false },
+            // pause: { type: 'boolean', index: false, doc_values: false },
+            // value: { type: 'integer', index: false, doc_values: false },
           },
         },
-        rowsPerPage: { type: 'integer', index: false, doc_values: false },
+        // rowsPerPage: { type: 'integer', index: false, doc_values: false },
         breakdownField: { type: 'text' },
       },
     },