diff --git a/packages/select-rich/test/lion-select-invoker.test.js b/packages/select-rich/test/lion-select-invoker.test.js
index 526470252..4f1df75f4 100644
--- a/packages/select-rich/test/lion-select-invoker.test.js
+++ b/packages/select-rich/test/lion-select-invoker.test.js
@@ -48,6 +48,22 @@ describe('lion-select-invoker', () => {
     expect(el.getAttribute('tabindex')).to.equal('0');
   });
 
+  it('should not render after slot when singleOption is true', async () => {
+    const el = await fixture(html`
+      <lion-select-invoker .singleOption="${true}"></lion-select-invoker>
+    `);
+
+    expect(el.shadowRoot.querySelector('slot[name="after"]')).to.not.exist;
+  });
+
+  it('should render after slot when singleOption is not true', async () => {
+    const el = await fixture(html`
+      <lion-select-invoker></lion-select-invoker>
+    `);
+
+    expect(el.shadowRoot.querySelector('slot[name="after"]')).to.exist;
+  });
+
   describe('Subclassers', () => {
     it('supports a custom _contentTemplate', async () => {
       const myTag = defineCE(
diff --git a/packages/select-rich/test/lion-select-rich.test.js b/packages/select-rich/test/lion-select-rich.test.js
index dd04cca8e..b6e14a2b9 100644
--- a/packages/select-rich/test/lion-select-rich.test.js
+++ b/packages/select-rich/test/lion-select-rich.test.js
@@ -429,6 +429,29 @@ describe('lion-select-rich', () => {
 
       expect(el._overlayCtrl.inheritsReferenceWidth).to.equal('full');
     });
+
+    it('should set singleOption to true when options change dynamically to 1 option', async () => {
+      const elSingleoption = await fixture(html`
+        <lion-select-rich>
+          <lion-options slot="input">
+            <lion-option .choiceValue=${10}>Item 1</lion-option>
+            <lion-option .choiceValue=${20}>Item 2</lion-option>
+          </lion-options>
+        </lion-select-rich>
+      `);
+
+      elSingleoption._invokerNode.click();
+      await elSingleoption.updateComplete;
+      expect(elSingleoption.singleOption).to.be.undefined;
+
+      const optionELm = elSingleoption.querySelectorAll('lion-option')[0];
+      optionELm.parentNode.removeChild(optionELm);
+      elSingleoption.requestUpdate();
+
+      elSingleoption._invokerNode.click();
+      await elSingleoption.updateComplete;
+      expect(elSingleoption.singleOption).to.be.true;
+    });
   });
 
   describe('interaction-mode', () => {