diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
index e5fcafdce..65103db8b 100644
--- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
@@ -324,16 +324,19 @@ public class PlayerListener implements Listener {
             case FISHING:
                 if (fishingManager.canMasterAngler()) {
                     fishingManager.masterAngler(event.getHook());
+                    fishingManager.setFishingTarget();
                 }
                 return;
 
             case CAUGHT_FISH:
                 fishingManager.handleFishing((Item) caught);
+                fishingManager.setFishingTarget();
                 return;
 
             case CAUGHT_ENTITY:
                 if (fishingManager.canShake(caught)) {
                     fishingManager.shakeCheck((LivingEntity) caught);
+                    fishingManager.setFishingTarget();
                 }
                 return;
 
diff --git a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
index 49792ae63..d252d8a6c 100644
--- a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
@@ -66,7 +66,7 @@ public class FishingManager extends SkillManager {
         }
 
         long currentTime = System.currentTimeMillis();
-        boolean hasFished = (currentTime < fishingTimestamp + FISHING_COOLDOWN_SECONDS);
+        boolean hasFished = (currentTime < fishingTimestamp + (FISHING_COOLDOWN_SECONDS * 10));
 
         if(hasFished == true)
             fishingTimestamp = currentTime;
@@ -77,6 +77,10 @@ public class FishingManager extends SkillManager {
         return hasFished || sameTarget;
     }
 
+    public void setFishingTarget() {
+        getPlayer().getTargetBlock(BlockUtils.getTransparentBlocks(), 100);
+    }
+
     public boolean canIceFish(Block block) {
         if (getSkillLevel() < RankUtils.getUnlockLevel(SubSkillType.FISHING_ICE_FISHING)) {
             return false;