diff --git a/client/coral-embed-stream/src/tabs/stream/containers/Stream.js b/client/coral-embed-stream/src/tabs/stream/containers/Stream.js
index 1eae7d816..9687a9370 100644
--- a/client/coral-embed-stream/src/tabs/stream/containers/Stream.js
+++ b/client/coral-embed-stream/src/tabs/stream/containers/Stream.js
@@ -465,9 +465,6 @@ const mapStateToProps = state => ({
   activeStreamTab: state.stream.activeTab,
   previousStreamTab: state.stream.previousTab,
   commentClassNames: state.stream.commentClassNames,
-
-  // @Deprecated plugin_config
-  pluginsConfig: state.config.plugins_config || state.config.plugin_config,
   sortOrder: state.stream.sortOrder,
   sortBy: state.stream.sortBy,
 });
diff --git a/client/coral-framework/components/Slot.js b/client/coral-framework/components/Slot.js
index 0dea70e57..049d075ab 100644
--- a/client/coral-framework/components/Slot.js
+++ b/client/coral-framework/components/Slot.js
@@ -93,12 +93,6 @@ class Slot extends React.Component {
       children = children.map(childFactory);
     }
 
-    const debugProps = pluginsConfig.debug
-      ? {
-          'data-slot-name': fill,
-        }
-      : {};
-
     return (
       <Component
         className={cn(
@@ -109,7 +103,6 @@ class Slot extends React.Component {
           className,
           `talk-slot-${kebabCase(fill)}`
         )}
-        {...debugProps}
       >
         {children}
       </Component>
diff --git a/client/coral-framework/services/plugins.js b/client/coral-framework/services/plugins.js
index fbd2ae21f..8f9ad5b41 100644
--- a/client/coral-framework/services/plugins.js
+++ b/client/coral-framework/services/plugins.js
@@ -102,8 +102,16 @@ class PluginsService {
       get(reduxState, 'config.plugins_config') ||
       get(reduxState, 'config.plugin_config') ||
       emptyConfig;
+
+    const debugProps = pluginsConfig.debug
+      ? {
+          'data-slot-name': props.fill,
+        }
+      : {};
+
     return {
       ...props,
+      ...debugProps,
       config: pluginsConfig,
       ...(component.fragments
         ? pick(queryData, Object.keys(component.fragments))