diff --git a/Deliveroo/Deliveroo.csproj b/Deliveroo/Deliveroo.csproj
index 9d78b0b..4759985 100644
--- a/Deliveroo/Deliveroo.csproj
+++ b/Deliveroo/Deliveroo.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Dalamud.NET.Sdk/9.0.2">
     <PropertyGroup>
-        <Version>5.0</Version>
+        <Version>5.1</Version>
         <OutputPath>dist</OutputPath>
     </PropertyGroup>
 
diff --git a/Deliveroo/DeliverooPlugin.GrandCompanySupplyReward.cs b/Deliveroo/DeliverooPlugin.GrandCompanySupplyReward.cs
index ebfb1ae..e75c06e 100644
--- a/Deliveroo/DeliverooPlugin.GrandCompanySupplyReward.cs
+++ b/Deliveroo/DeliverooPlugin.GrandCompanySupplyReward.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using Dalamud.Game.Addon.Lifecycle;
 using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
+using Dalamud.Game.ClientState.Keys;
 using Dalamud.Game.Text.SeStringHandling;
 using Deliveroo.GameData;
 using FFXIVClientStructs.FFXIV.Client.UI;
@@ -13,7 +14,7 @@ partial class DeliverooPlugin
 {
     private unsafe void GrandCompanySupplyRewardPostSetup(AddonEvent type, AddonArgs args)
     {
-        bool quickTurnIn = CurrentStage == Stage.Stopped && _keyState[_configuration.QuickTurnInKey];
+        bool quickTurnIn = CurrentStage == Stage.Stopped && _configuration.QuickTurnInKey != VirtualKey.NO_KEY && _keyState[_configuration.QuickTurnInKey];
         if (CurrentStage == Stage.TurnInSelected || quickTurnIn)
         {
             AddonGrandCompanySupplyReward* addonSupplyReward = (AddonGrandCompanySupplyReward*)args.Addon;
diff --git a/Deliveroo/DeliverooPlugin.SelectYesNo.cs b/Deliveroo/DeliverooPlugin.SelectYesNo.cs
index c442b7e..4f17dfe 100644
--- a/Deliveroo/DeliverooPlugin.SelectYesNo.cs
+++ b/Deliveroo/DeliverooPlugin.SelectYesNo.cs
@@ -1,6 +1,7 @@
 using System;
 using Dalamud.Game.Addon.Lifecycle;
 using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
+using Dalamud.Game.ClientState.Keys;
 using Dalamud.Memory;
 using FFXIVClientStructs.FFXIV.Client.UI;
 
@@ -40,7 +41,7 @@ partial class DeliverooPlugin
                 CurrentStage = Stage.CloseGcExchange;
             ContinueAt = DateTime.Now.AddSeconds(0.5);
         }
-        else if ((CurrentStage == Stage.TurnInSelected || _keyState[_configuration.QuickTurnInKey]) &&
+        else if ((CurrentStage == Stage.TurnInSelected || (_configuration.QuickTurnInKey != VirtualKey.NO_KEY && _keyState[_configuration.QuickTurnInKey])) &&
                  _gameStrings.TradeHighQualityItem == text)
         {
             _pluginLog.Information($"Selecting 'yes' ({text})");