diff --git a/engine/apps/base/utils.py b/engine/apps/base/utils.py
index f8ad633f..8dc1f5fa 100644
--- a/engine/apps/base/utils.py
+++ b/engine/apps/base/utils.py
@@ -38,7 +38,7 @@ class LiveSettingValidator:
     def get_error(self):
         check_fn_name = f"_check_{self.live_setting.name.lower()}"
 
-        if self.live_setting.value is None:
+        if self.live_setting.value in (None, ""):
             return "Empty"
 
         # skip validation if there's no handler for it
diff --git a/grafana-plugin/src/pages/livesettings/LiveSettings.helpers.ts b/grafana-plugin/src/pages/livesettings/LiveSettings.helpers.ts
index d7edb1d0..d910a2c0 100644
--- a/grafana-plugin/src/pages/livesettings/LiveSettings.helpers.ts
+++ b/grafana-plugin/src/pages/livesettings/LiveSettings.helpers.ts
@@ -1,7 +1,7 @@
 import { NULL_VALUE } from './LiveSettings.config';
 
 export function normalizeValue(value: string) {
-  if (value === null) {
+  if (value === null || value === '') {
     return NULL_VALUE;
   }