diff --git a/public/index.php b/public/index.php
index 55202fc..580c33f 100644
--- a/public/index.php
+++ b/public/index.php
@@ -65,7 +65,7 @@ if (isset($_GET["backgroundcolor"]) && !empty($_GET["backgroundcolor"]) && preg_
                     </div>
                 </div>
                 <?php
-            } else if (empty($_GET["id"]) || (!Machine::exists($_GET["id"]) && !Machine::serialExists($_GET["id"]))) {
+            } else if (empty($_GET["id"]) || (!Machine::exists($_GET["id"]) && !Machine::serialExists($_GET["id"]) && !Component::exists($_GET["id"]))) {
                 // try package tracking query
                 $trackingok = false;
                 if (!empty($_GET["id"]) && preg_match("/^[a-z0-9]{10,}$/", $_GET["id"])) {
@@ -186,6 +186,90 @@ if (isset($_GET["backgroundcolor"]) && !empty($_GET["backgroundcolor"]) && preg_
             } else {
                 if (Machine::exists($_GET["id"])) {
                     $machine = new Machine($_GET['id']);
+                } else if (Component::exists($_GET["id"])) {
+                    $component = new Component($_GET["id"]);
+                    $mid = $component->getMachineID();
+                    if (!empty($mid) && Machine::exists($mid)) {
+                        $machine = new Machine($mid);
+                    } else {
+                        // component exists but isn't attached to a machine
+                        ?>
+                        <div class="card">
+                            <h3 class="card-header d-flex">
+                                <div>
+                                    <i class="fas fa-memory"></i> <?php echo $component->getTypeName(); ?> Info
+                                </div>
+                            </h3>
+                            <div class="card-body">
+                                <div class="alert alert-info">
+                                    <i class="fas fa-info-circle"></i> This component ID exists in the system but has no associated device.
+                                </div>
+                                <div class="row">
+                                    <div class="col-12 mb-3">
+                                        <div class="list-group">
+                                            <div class="list-group-item">
+                                                <b><?php $Strings->get("ID"); ?></b>: <?php echo htmlspecialchars($component->getID()); ?>
+                                            </div>
+                                            <?php if (!empty($component->getModel())) { ?>
+                                                <div class="list-group-item"><b><?php $Strings->get("Model"); ?></b>: <?php echo htmlspecialchars($component->getModel()); ?></div>
+                                                <?php
+                                            }
+
+                                            if (!empty($component->getCapacity())) {
+                                                ?>
+                                                <div class="list-group-item"><b><?php $Strings->get("Capacity"); ?></b>:  <?php echo htmlspecialchars($component->getCapacity()); ?></div>
+                                                <?php
+                                            }
+
+                                            if (!empty($component->getSerial())) {
+                                                ?>
+                                                <div class="list-group-item"><b><?php $Strings->get("Serial"); ?></b>:  <?php echo htmlspecialchars($component->getSerial()); ?></div>
+                                                <?php
+                                            }
+
+                                            if (!empty($component->getTestedDate())) {
+                                                ?>
+                                                <div class="list-group-item"><b><?php $Strings->get("Tested On"); ?></b>:  <?php echo date($SETTINGS["date_format"], strtotime($component->getTestedDate())); ?></div>
+                                                <?php
+                                            }
+
+                                            if (!empty($component->getPrice())) {
+                                                ?>
+                                                <div class="list-group-item"><b><?php $Strings->get("Price"); ?></b>: $<?php echo number_format($component->getPrice(), 2); ?></div>
+                                                <?php
+                                            }
+
+                                            if (!empty($component->getManufacturer())) {
+                                                ?>
+                                                <div class="list-group-item"><b><?php $Strings->get("Manufacturer"); ?></b>:  <?php echo htmlspecialchars($component->getManufacturer()); ?></div>
+                                                <?php
+                                            }
+
+                                            if (!empty($component->getPublicNotes())) {
+                                                ?>
+                                                <div class="list-group-item">
+                                                    <b>Notes:</b><br>
+                                                    <div class="ml-3"><?php echo htmlspecialchars($component->getPublicNotes()); ?></div>
+                                                </div>
+                                            <?php } ?>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <?php /* Hide this box if we're embedded in another page */ if (!isset($_GET["embed"])) { ?>
+                                <div class="card-body">
+                                    <p>
+                                        Look up another device:
+                                    </p>
+                                    <form method="GET">
+                                        <input type="text" name="id" class="form-control" placeholder="<?php echo $SETTINGS["branding"]["shortmachineid"]; ?>" required />
+                                        <button type="submit" class="btn btn-primary btn-block mt-2">Get Info</button>
+                                    </form>
+                                </div>
+                            <?php } ?>
+                        </div>
+                        <?php
+                    }
                 } else {
                     $machine = new Machine(Machine::getIDFromSerial($_GET['id']));
                 }