diff --git a/packages/core/src/button/button.css b/packages/core/src/button/button.css
index 6b3e3fd6..5ba9e0e5 100644
--- a/packages/core/src/button/button.css
+++ b/packages/core/src/button/button.css
@@ -257,6 +257,7 @@
     transition-duration: var(--f-button-transition-delay);
 }
 
+.f-button.is-subtle:not(:disabled,.is-loading).is-active,
 .f-button.is-subtle:not(:disabled):hover {
     background: var(--f-button-background-color-hover);
 }
diff --git a/packages/core/src/hooks/event.hook.ts b/packages/core/src/hooks/event.hook.ts
index d357976b..d23d3a27 100644
--- a/packages/core/src/hooks/event.hook.ts
+++ b/packages/core/src/hooks/event.hook.ts
@@ -27,6 +27,7 @@ export const dispatchCustomEvent = (eventName: string, data: any = {}) =>
 
 export const useCustomEvent = (event: string, handler, passive = false) => {
     useEffect(() => {
+        if (!event) return
         documentObject.addEventListener(event, handler, passive)
         return () => documentObject.removeEventListener(event, handler)
     })