diff --git a/code/fgame/weapturret.cpp b/code/fgame/weapturret.cpp
index 9b8a7229..6f0d806a 100644
--- a/code/fgame/weapturret.cpp
+++ b/code/fgame/weapturret.cpp
@@ -1267,10 +1267,12 @@ void TurretGun::AI_ThinkActive()
 
 void TurretGun::Think(void)
 {
-    if (owner || (!m_bHadOwner && aim_target)) {
+    if (!owner && (m_bHadOwner || !aim_target)) {
+        ThinkIdle();
+    } else if (owner && owner->IsSubclassOfPlayer()) {
         P_ThinkActive();
     } else {
-        ThinkIdle();
+        AI_ThinkActive();
     }
 }