diff --git a/src/equicordplugins/allCallTimers/index.tsx b/src/equicordplugins/allCallTimers/index.tsx
index c1c1486f2..9d60c2aef 100644
--- a/src/equicordplugins/allCallTimers/index.tsx
+++ b/src/equicordplugins/allCallTimers/index.tsx
@@ -106,21 +106,16 @@ export default definePlugin({
     patches: [
         {
             find: ".usernameSpeaking]",
-            predicate: () => !settings.store.showWithoutHover,
             replacement: [
                 {
                     match: /(?<=user:(\i).*?)iconGroup,.{0,200}children:\[/,
-                    replace: "$&$self.renderTimer($1.id),"
+                    replace: "$&$self.renderTimer($1.id),",
+                    predicate: () => !settings.store.showWithoutHover,
                 },
-            ]
-        },
-        {
-            find: ".usernameSpeaking]",
-            predicate: () => settings.store.showWithoutHover,
-            replacement: [
                 {
                     match: /function \i\(\)\{.+:""(?=.*?userId:(\i))/,
-                    replace: "$&,$self.renderTimer($1.id),"
+                    replace: "$&,$self.renderTimer($1.id),",
+                    predicate: () => settings.store.showWithoutHover,
                 }
             ]
         }
diff --git a/src/equicordplugins/userpfp/index.tsx b/src/equicordplugins/userpfp/index.tsx
index 9faa173c4..ebbdaf4b2 100644
--- a/src/equicordplugins/userpfp/index.tsx
+++ b/src/equicordplugins/userpfp/index.tsx
@@ -101,7 +101,8 @@ export default definePlugin({
                 },
                 {
                     match: /(getGuildMemberAvatarURLSimple:)(\i),/,
-                    replace: "$1$self.getAvatarServerHook($2),"
+                    replace: "$1$self.getAvatarServerHook($2),",
+                    predicate: () => settings.store.overrideServerAvatars
                 }
             ]
         }
@@ -139,7 +140,6 @@ export default definePlugin({
     getAvatarServerHook: (original: any) => (config: any) => {
         const { userId, avatar, size, canAnimate } = config;
         const { avatars } = data;
-        if (!settings.store.overrideServerAvatars) return original(config);
 
         if (avatars[userId]) {
             const customUrl = avatars[userId];