diff --git a/public/app/features/alerting/unified/components/import-to-gma/NamespaceAndGroupFilter.tsx b/public/app/features/alerting/unified/components/import-to-gma/NamespaceAndGroupFilter.tsx
index 6cab25cb808..73bc85ed022 100644
--- a/public/app/features/alerting/unified/components/import-to-gma/NamespaceAndGroupFilter.tsx
+++ b/public/app/features/alerting/unified/components/import-to-gma/NamespaceAndGroupFilter.tsx
@@ -59,7 +59,7 @@ export const NamespaceAndGroupFilter = ({ rulesSourceName }: Props) => {
               {...field}
               onChange={(value) => {
                 setValue('ruleGroup', ''); //reset if namespace changes
-                onChange(value.value);
+                onChange(value?.value);
               }}
               id="namespace-picker"
               placeholder={t('alerting.namespace-and-group-filter.select-namespace', 'Select namespace')}
@@ -67,6 +67,7 @@ export const NamespaceAndGroupFilter = ({ rulesSourceName }: Props) => {
               width={42}
               loading={isLoading}
               disabled={isLoading || !rulesSourceName}
+              isClearable
             />
           )}
           name="namespace"
@@ -88,12 +89,13 @@ export const NamespaceAndGroupFilter = ({ rulesSourceName }: Props) => {
               options={groupOptions}
               width={42}
               onChange={(value) => {
-                setValue('ruleGroup', value.value ?? '');
+                setValue('ruleGroup', value?.value ?? '');
               }}
               id="group-picker"
               placeholder={t('alerting.namespace-and-group-filter.select-group', 'Select group')}
               loading={isLoading}
               disabled={isLoading || !namespace || !rulesSourceName}
+              isClearable
             />
           )}
           name="ruleGroup"