diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index 0a68511a..a6652313 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -855,8 +855,13 @@ Skill* Creature::GetSkill(int skill_id)
 bool Creature::HasUseableSkill()
 {
     for (auto& pair : skill_hash_) {
-        if (pair.second->IsMainSkill() &&
-            InternalCanUseSkill(pair.second.get())) {
+        if (IsAndroid() && !pair.second->IsMainSkill()) {
+            continue;
+        }
+        if (pair.second->GetMinorType()) {
+            continue;
+        }
+        if (InternalCanUseSkill(pair.second.get())) {
             return true;
         }
     }
@@ -875,7 +880,7 @@ bool Creature::CanUseSkill(int skill_id)
 bool Creature::InternalCanUseSkill(Skill* skill)
 {
     #if 1
-    if (!skill->IsMainSkill()) {
+    if (IsAndroid() && !skill->IsMainSkill()) {
         return false;
     }
     #endif