diff --git a/app/src/main/java/com/limelight/grid/PcGridAdapter.java b/app/src/main/java/com/limelight/grid/PcGridAdapter.java
index 5ab4c06a..2d5ad728 100644
--- a/app/src/main/java/com/limelight/grid/PcGridAdapter.java
+++ b/app/src/main/java/com/limelight/grid/PcGridAdapter.java
@@ -78,7 +78,10 @@ public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
             overlayView.setAlpha(0.4f);
             return true;
         }
-        else if (obj.details.pairState == PairingManager.PairState.NOT_PAIRED) {
+        // We must check if the status is exactly online and unpaired
+        // to avoid colliding with the loading spinner when status is unknown
+        else if (obj.details.state == ComputerDetails.State.ONLINE &&
+                obj.details.pairState == PairingManager.PairState.NOT_PAIRED) {
             overlayView.setImageResource(R.drawable.ic_lock);
             overlayView.setAlpha(1.0f);
             return true;