diff --git a/_data/devices/foster_tab_variant1.yml b/_data/devices/foster_tab_variant1.yml
index 77eb5eebd2..9391bac8a5 100644
--- a/_data/devices/foster_tab_variant1.yml
+++ b/_data/devices/foster_tab_variant1.yml
@@ -19,6 +19,7 @@ name: Shield TV (2015 / 2015 Pro / 2017 / 2019 Pro) [Tablet]
 network: None
 no_oem_unlock_switch: true
 peripherals: None
+quirks: [atv_remote_mic, nvidia_remotes]
 ram: 3 GB
 recovery_boot: With the device powered off, plug the included Shield controller into the USB-A port on the back of the device.
   Next, hold the <kbd>A button</kbd> and <kbd>B button</kbd> while plugging the device into power, continue until a menu is displayed.
diff --git a/_data/devices/foster_variant1.yml b/_data/devices/foster_variant1.yml
index 0704218b96..9ec2111ba9 100644
--- a/_data/devices/foster_variant1.yml
+++ b/_data/devices/foster_variant1.yml
@@ -19,7 +19,7 @@ name: Shield TV (2015 / 2015 Pro / 2017 / 2019 Pro) [Android TV]
 network: None
 no_oem_unlock_switch: true
 peripherals: None
-quirks: [atv_remote_mic]
+quirks: [atv_remote_mic, nvidia_remotes]
 ram: 3 GB
 recovery_boot: With the device powered off, plug the included Shield controller into the USB-A port on the back of the device.
   Next, hold the <kbd>A button</kbd> and <kbd>B button</kbd> while plugging the device into power, continue until a menu is displayed.
diff --git a/pages/quirks/nvidia_remotes.md b/pages/quirks/nvidia_remotes.md
new file mode 100644
index 0000000000..7ac73b1b2b
--- /dev/null
+++ b/pages/quirks/nvidia_remotes.md
@@ -0,0 +1,21 @@
+---
+sidebar: home_sidebar
+title: Quirks - NVIDIA Remotes
+permalink: quirks/nvidia_remotes/
+robots: noindex
+search: exclude
+toc: false
+---
+
+## NVIDIA Remotes
+
+Depending on which model of SHIELD TV you have, and which accessories you purchased with it, you will have a different remote and/or controller, please refer to the table, and the images linked in the names of each remote below to check compatibility:
+
+|Remote                    |Codename     |Compatible?   |Reason          |
+|--------------------------|-------------|--------------|----------------|
+|[SHIELD Remote (2015)](https://www.nvidia.com/content/dam/en-zz/Solutions/SHIELD/shop/shield-remote-2015-625.png) | jarvis | Yes | N/A |
+|[SHIELD Remote (2017)](https://www.nvidia.com/content/dam/en-zz/Solutions/SHIELD/shop/shield-remote-2017-625.png) | pepper | No | Fails to pair on modern Android versions, likely some missing Bluetooth LE (Low Energy) stack hacks. |
+|[SHIELD Remote (2019)](https://www.nvidia.com/content/shield/images/shield-remote.png) | friday | Yes | N/A |
+|[SHIELD Controller (2015)](https://www.nvidia.com/content/shield/images/shield-controller-2015.png) | blake | No | Utilizes a proprietary Wi-Fi Direct implementation that has not been implemented functionally in LineageOS. |
+|[SHIELD Controller (2017)](https://www.nvidia.com/content/shield/images/shield-controller.png) | thunderstrike | Yes | N/A |
+{: .table }
diff --git a/test/schema-06.yml b/test/schema-06.yml
index e2530b4748..39349a9181 100644
--- a/test/schema-06.yml
+++ b/test/schema-06.yml
@@ -503,6 +503,7 @@ definitions:
       - hardware_encryption
       - ims
       - nfc
+      - nvidia_remotes
       - usb
     type: string
 properties: