diff --git a/ui/src/utils/defaultQueryConfig.js b/ui/src/utils/defaultQueryConfig.js
index f0b9911064..37b4784484 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}) => {
-  let queryConfig = {
+  const queryConfig = {
     id,
     database: null,
     measurement: null,
@@ -17,11 +17,7 @@ const defaultQueryConfig = ({id, isKapacitorRule = false}) => {
     status: null,
   }
 
-  if (!isKapacitorRule) {
-    queryConfig = {...queryConfig, fill: NULL_STRING}
-  }
-
-  return queryConfig
+  return isKapacitorRule ? queryConfig : {...queryConfig, fill: NULL_STRING}
 }
 
 export default defaultQueryConfig
diff --git a/ui/src/utils/queryTransitions.js b/ui/src/utils/queryTransitions.js
index 28d53664d9..328a08b1dc 100644
--- a/ui/src/utils/queryTransitions.js
+++ b/ui/src/utils/queryTransitions.js
@@ -126,16 +126,11 @@ export function applyFuncsToField(
     time: shouldRemoveFuncs ? null : defaultGroupBy,
   })
 
-  let nextQuery = {...query, fields: nextFields, groupBy: nextGroupBy}
+  const 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
-    nextQuery = {...nextQuery, fill: nextFill}
-  }
-
-  return nextQuery
+  return isKapacitorRule ? nextQuery : {...nextQuery, fill: NULL_STRING}
 }
 
 export function updateRawQuery(query, rawText) {