diff --git a/src/frontend/src/components/plugins/RemoteComponent.tsx b/src/frontend/src/components/plugins/RemoteComponent.tsx
index 71a586ed87..490a847bac 100644
--- a/src/frontend/src/components/plugins/RemoteComponent.tsx
+++ b/src/frontend/src/components/plugins/RemoteComponent.tsx
@@ -111,12 +111,28 @@ export default function RemoteComponent({
         `${t`Invalid source or function name`} - ${source} /${func}`
       );
     }
-  }, [componentRef, rootElement, source, defaultFunctionName, context]);
+  }, [
+    componentRef.current,
+    rootElement.current,
+    source,
+    defaultFunctionName,
+    context
+  ]);
 
   // Reload the plugin content dynamically
   useEffect(() => {
     reloadPluginContent();
-  }, [func, context, rootElement.current]);
+  }, [
+    func,
+    rootElement.current,
+    context.id,
+    context.model,
+    context.instance,
+    context.user,
+    context.colorScheme,
+    context.locale,
+    context.context
+  ]);
 
   return (
     <Boundary label={identifierString(`RemoteComponent-${func}`)}>