diff --git a/ui/src/utils/defaultQueryConfig.js b/ui/src/utils/defaultQueryConfig.js
index 137414116..f0b991106 100644
--- a/ui/src/utils/defaultQueryConfig.js
+++ b/ui/src/utils/defaultQueryConfig.js
@@ -1,7 +1,7 @@
 import {NULL_STRING} from 'shared/constants/queryFillOptions'
 
 const defaultQueryConfig = ({id, isKapacitorRule = false}) => {
-  const queryConfig = {
+  let queryConfig = {
     id,
     database: null,
     measurement: null,
@@ -12,14 +12,13 @@ const defaultQueryConfig = ({id, isKapacitorRule = false}) => {
       time: null,
       tags: [],
     },
-    fill: NULL_STRING,
     areTagsAccepted: true,
     rawText: null,
     status: null,
   }
 
-  if (isKapacitorRule) {
-    delete queryConfig.fill
+  if (!isKapacitorRule) {
+    queryConfig = {...queryConfig, fill: NULL_STRING}
   }
 
   return queryConfig
diff --git a/ui/src/utils/queryTransitions.js b/ui/src/utils/queryTransitions.js
index 8676fd253..28d53664d 100644
--- a/ui/src/utils/queryTransitions.js
+++ b/ui/src/utils/queryTransitions.js
@@ -126,13 +126,13 @@ export function applyFuncsToField(
     time: shouldRemoveFuncs ? null : defaultGroupBy,
   })
 
-  const nextQuery = {...query, fields: nextFields, groupBy: nextGroupBy}
+  let nextQuery = {...query, fields: nextFields, groupBy: nextGroupBy}
 
   // fill is not valid for kapacitor query configs since there is no actual
   // query and all alert rules create stream-based tasks currently
   if (!isKapacitorRule) {
     const nextFill = NULL_STRING
-    Object.assign(nextQuery, {fill: nextFill})
+    nextQuery = {...nextQuery, fill: nextFill}
   }
 
   return nextQuery