diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5bbc5b5b1b..2c01901ae1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -77,6 +77,7 @@
     Bug #7603: Scripts menu size is not updated properly
     Bug #7604: Goblins Grunt becomes idle once injured
     Bug #7609: ForceGreeting should not open dialogue for werewolves
+    Bug #7630: Charm can be cast on creatures
     Feature #3537: Shader-based water ripples
     Feature #5492: Let rain and snow collide with statics
     Feature #6149: Dehardcode Lua API_REVISION
diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index d9137dcc3d..2e28aaa1f3 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -559,6 +559,10 @@ namespace MWMechanics
                 modifyAiSetting(
                     target, effect, ESM::MagicEffect::RallyCreature, AiSetting::Flee, -effect.mMagnitude, invalid);
                 break;
+            case ESM::MagicEffect::Charm:
+                if (!target.getClass().isNpc())
+                    invalid = true;
+                break;
             case ESM::MagicEffect::Sound:
                 if (target == getPlayer())
                 {