diff --git a/pick.lic b/pick.lic
index fa218c517e..d4605ae084 100644
--- a/pick.lic
+++ b/pick.lic
@@ -102,7 +102,7 @@ class Pick
 
     @picking_room_id = Room.current.id
 
-    @refill_town = @settings.refill_town = @settings.refill_town.to_s
+    @lockpick_costs = picking_data['lockpick_costs'][@settings.refill_town || @settings.fang_cove_override_town || @settings.hometown]
 
     if @debug
       echo "Settings..."
@@ -134,12 +134,6 @@ class Pick
       echo "- assumed_difficulty: #{@assumed_difficulty}"
     end
 
-    if @refill_town.empty?
-      @lockpick_costs = picking_data['lockpick_costs'][@settings.fang_cove_override_town || @settings.hometown]
-    else
-      @lockpick_costs = picking_data['lockpick_costs'][@settings.refill_town]
-    end
-
     if args.refill
       refill_ring
     elsif stop_picking?
@@ -325,13 +319,13 @@ class Pick
       return
     end
 
-    if @refill_town.empty?
+    if @refill_town.nil?
       DRCM.ensure_copper_on_hand(cost * lockpicks_needed, @settings)
     else
       DRCM.ensure_copper_on_hand(cost * lockpicks_needed, @settings, @refill_town)
     end
 
-    if @refill_town.empty?
+    if @refill_town.nil?
       DRCT.refill_lockpick_container(@settings.lockpick_type, @settings.fang_cove_override_town || @settings.hometown, @lockpick_container, lockpicks_needed)
     else
       DRCT.refill_lockpick_container(@settings.lockpick_type, @refill_town, @lockpick_container, lockpicks_needed)
diff --git a/profiles/base.yaml b/profiles/base.yaml
index 64b7994281..57f959d16c 100644
--- a/profiles/base.yaml
+++ b/profiles/base.yaml
@@ -1233,7 +1233,7 @@ use_skeleton_key: false
 use_lockpick_ring: true
 skip_lockpick_ring_refill: false
 # If skip_lockpick_ring_refill is false and your hometown doesn't have a locksmith shop, add the nearest town with a shop here.
-refill_town: Shard
+refill_town:
 # If you set 'use_lockpick_ring: false' then specify
 # the container that holds your loose lockpicks.
 # If you set 'use_lockpick_ring: true' then specify