diff --git a/frontend/src/lib/newQueryBuilder/getAutocompleteValueAndType.ts b/frontend/src/lib/newQueryBuilder/getAutocompleteValueAndType.ts
index bbc7c8fcfe..307d28bc29 100644
--- a/frontend/src/lib/newQueryBuilder/getAutocompleteValueAndType.ts
+++ b/frontend/src/lib/newQueryBuilder/getAutocompleteValueAndType.ts
@@ -2,8 +2,6 @@ import { autocompleteType } from 'constants/queryBuilder';
 import { SPLIT_FIRST_UNDERSCORE } from 'constants/regExp';
 
 export const getAutocompleteValueAndType = (str: string): [string, string] => {
-	if (str === '') return [str, str];
-
 	const [firstValue, secondValue] = str.split(SPLIT_FIRST_UNDERSCORE);
 
 	if (
@@ -13,5 +11,5 @@ export const getAutocompleteValueAndType = (str: string): [string, string] => {
 		return [firstValue, secondValue];
 	}
 
-	return ['', firstValue];
+	return [str, str];
 };