diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraFinesse.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraFinesse.java
index 8ae030cda53..b454f0da0f0 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraFinesse.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraFinesse.java
@@ -102,9 +102,13 @@ class AuraFinesseEffect extends OneShotEffect<AuraFinesseEffect> {
         Permanent aura = game.getPermanent(source.getFirstTarget());
         Permanent creature = game.getPermanent(source.getTargets().get(1).getFirstTarget());
         if (aura != null && creature != null) {
-            aura.attachTo(creature.getId(), game);
-            creature.addAttachment(aura.getId(), game);
-            return true;
+            Permanent oldCreature = game.getPermanent(aura.getAttachedTo());
+            if (oldCreature == null || oldCreature.equals(creature)) {
+                return false;
+            }
+            if (oldCreature.removeAttachment(aura.getId(), game)) {
+                return creature.addAttachment(aura.getId(), game);
+            }
         }
         return false;
     }