diff --git a/megamek/src/megamek/common/Entity.java b/megamek/src/megamek/common/Entity.java
index b1c01c2bb20..af8954aae09 100644
--- a/megamek/src/megamek/common/Entity.java
+++ b/megamek/src/megamek/common/Entity.java
@@ -5187,7 +5187,7 @@ public boolean hasGhostTargets(boolean active) {
         }
 
         // if you failed your ghost target PSR, then it doesn't matter
-        if ((active && (getGhostTargetRollMoS() < 0)) || isShutDown()) {
+        if ((ghostTargetRoll == null) || (active && (getGhostTargetRollMoS() < 0)) || isShutDown()) {
             return false;
         }
         boolean hasGhost = false;