diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst005.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst005.cpp
index 494faea0..c37589af 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst005.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst005.cpp
@@ -59,7 +59,10 @@ class SubFst005 : public EventScript
       player.playScene( getId(), 0, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
       {
-         player.updateQuest( getId(), 255 );
+         if( result.param2 == 1 )
+         {
+            player.updateQuest( getId(), 255 );
+         }
       } );
    }
 
@@ -71,7 +74,7 @@ class SubFst005 : public EventScript
          if( result.param2 == 1 )
          {
             if( player.giveQuestRewards( getId(), 0 ) )
-               player.finishQuest( getId());
+               player.finishQuest( getId() );
          }
       } );
    }
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst039.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst039.cpp
index 51e538e4..d0d0e7ef 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst039.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst039.cpp
@@ -47,11 +47,11 @@ class SubFst039 : public EventScript
    {
       auto actor = Event::mapEventActorToRealActor( actorId );
 
-      if( actor == SubFst039::Actor0 && !player.hasQuest( getId() ) )
+      if( actor == Actor0 && !player.hasQuest( getId() ) )
       {
          Scene00000( player );
       }
-      if( actor == SubFst039::Actor0 && player.getQuestSeq( getId() ) == 255 )
+      if( actor == Actor0 )
       {
          Scene00001( player );
       }
@@ -92,7 +92,7 @@ class SubFst039 : public EventScript
       player.playScene( getId(), 1, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            if( player.getQuestUI8AL( getId() ) == 1 )
+            if( result.param2 == 1 )
             {
                if( player.giveQuestRewards( getId(), 0 ) )
                {