diff --git a/docs/.eleventy.js b/docs/.eleventy.js
index add281c3e..1630652d7 100644
--- a/docs/.eleventy.js
+++ b/docs/.eleventy.js
@@ -123,10 +123,10 @@ export default function (eleventyConfig) {
       return `./dist/components/${name}/${name}.js`;
     });
 
-  // eleventyConfig.addPlugin(litPlugin, {
-  //   mode: 'worker',
-  //   componentModules
-  // });
+  eleventyConfig.addPlugin(litPlugin, {
+    mode: 'worker',
+    componentModules
+  });
 
   // Build the search index
   eleventyConfig.addPlugin(
diff --git a/src/components/select/select.ts b/src/components/select/select.ts
index f4646d3c3..d9efc6995 100644
--- a/src/components/select/select.ts
+++ b/src/components/select/select.ts
@@ -874,7 +874,8 @@ export default class WaSelect extends WebAwesomeFormAssociatedElement {
                 @blur=${this.handleBlur}
               />
 
-              ${this.multiple ? html`<div part="tags" class="select__tags">${this.tags}</div>` : ''}
+              <!-- Tags need to wait for first hydration before populating. -->
+              ${this.multiple && this.updated ? html`<div part="tags" class="select__tags">${this.tags}</div>` : ''}
 
               <input
                 class="select__value-input"
diff --git a/src/internal/test/fixture.ts b/src/internal/test/fixture.ts
index cb659f705..062c4a94f 100644
--- a/src/internal/test/fixture.ts
+++ b/src/internal/test/fixture.ts
@@ -3,9 +3,10 @@
  * These fixtures will also auto-load all of our components.
  */
 
-import { aTimeout, fixture } from '@open-wc/testing';
+import { aTimeout, expect, fixture } from '@open-wc/testing';
 import { cleanupFixtures, ssrFixture as LitSSRFixture } from '@lit-labs/testing/fixtures.js';
 import type { LitElement, TemplateResult } from 'lit';
+import type WebAwesomeElement from '../webawesome-element.js';
 
 declare global {
   interface Window {
@@ -19,8 +20,10 @@ declare global {
 /**
  * This will hopefully move to a library or be built into Lit. Right now this does nothing.
  */
-function handleHydrationError() {
-  // console.error('LIT HYDRATION ERROR');
+function handleHydrationError(e: Event) {
+  const element = e.target as WebAwesomeElement;
+
+  expect(false).to.equal(true, `Expected ${element.tagName} to not have hydration error.`);
 }
 
 // This is a non-standard event I have added to the WebAwesomeElement base class.
@@ -32,7 +35,6 @@ document.addEventListener('lit-hydration-error', handleHydrationError);
  */
 export async function clientFixture<T extends HTMLElement = HTMLElement>(template: TemplateResult | string) {
   // Load all component definitions "customElements.define()"
-  // await Promise.allSettled(window.clientComponents.map(str => import(str)));
   return await fixture<T>(template);
 }
 
@@ -49,9 +51,6 @@ export async function hydratedFixture<T extends HTMLElement = HTMLElement>(templ
     hydrate: true
   });
 
-  // Load all component definitions "customElements.define()"
-  // await Promise.allSettled(window.clientComponents.map(str => import(str)));
-
   // This can be removed when this is fixed: https://github.com/lit/lit/issues/4709
   // This forces every element to "hydrate" and then wait for an update to complete (hydration)
   await Promise.allSettled(