diff --git a/FS25_ADSmartPickup/adFieldJobs.lua b/FS25_ADSmartPickup/adFieldJobs.lua
index 46d8840..bd6857f 100644
--- a/FS25_ADSmartPickup/adFieldJobs.lua
+++ b/FS25_ADSmartPickup/adFieldJobs.lua
@@ -80,6 +80,15 @@ function ADFieldJobs.startAtFor(s)
     return "first"
 end
 
+-- Skal en maskine med husket CP-waypoint genstartes efter indlæsning? Kun hvis den stadig er midt i jobbet: den
+-- står på en mark der er i gang med dens trin (fieldId), eller den står lige ved sit huskede waypoint. Et husket
+-- waypoint fra et gammelt job sendte ellers maskinen ud ad vejene (in-game 27/9: to ROPA'er). s = {fieldId, distance}
+ADFieldJobs.RESUME_NEAR_M = 30
+function ADFieldJobs.shouldResume(s)
+    if s.fieldId ~= nil then return true end
+    return type(s.distance) == "number" and s.distance <= ADFieldJobs.RESUME_NEAR_M
+end
+
 -- Beslutning for én mark. assignments = sæt på marken ({phase, stage, helper}); kun sæt på det aktuelle
 -- trin tæller (en aflæsningsvogn på vej hjem fra høsten forstyrrer ikke kultiveringen).
 -- env = {raining = bool}: vejrfølsomme trin (høst/slå/vend/riv/hø) sendes ikke ud i regn.
diff --git a/FS25_ADSmartPickup/adFieldWork.lua b/FS25_ADSmartPickup/adFieldWork.lua
index 3b5bfd0..dd0e248 100644
--- a/FS25_ADSmartPickup/adFieldWork.lua
+++ b/FS25_ADSmartPickup/adFieldWork.lua
@@ -933,12 +933,21 @@ function ADFieldWork.resumeAfterLoad(adEnv)
         local vehicle = rig.vehicle
         local wasWorking = vehicle.startCpAtLastWp ~= nil and vehicle.hasCpCourse ~= nil and vehicle:hasCpCourse()
             and vehicle.getCpLastRememberedWaypointIx ~= nil and vehicle:getCpLastRememberedWaypointIx() ~= nil
-        if wasWorking and not rig.busy and not rig.controlled then
+        local fieldId, distance = nil, nil
+        if wasWorking then
+            fieldId = ADFieldJobs.resumeField(rig.x, rig.z, rig.role, fields)
+            local course = ADCpBridge.getCourse(vehicle)
+            local okWp, wp = pcall(function() return course ~= nil and course:getWaypoint(vehicle:getCpLastRememberedWaypointIx()) or nil end)
+            if okWp and wp ~= nil and wp.x ~= nil then distance = math.sqrt((wp.x - rig.x) ^ 2 + (wp.z - rig.z) ^ 2) end
+        end
+        if wasWorking and not rig.busy and not rig.controlled and not ADFieldJobs.shouldResume({fieldId = fieldId, distance = distance}) then
+            Logging.info(ADFieldJobs.LOG_PREFIX .. "'%s' genstartes ikke: husket waypoint fra et gammelt job (%s væk, ikke på en mark i gang)",
+                tostring(rig.label), distance ~= nil and string.format("%.0f m", distance) or "ukendt afstand")
+        elseif wasWorking and not rig.busy and not rig.controlled then
             local ok, started = pcall(vehicle.startCpAtLastWp, vehicle)
             if not ok then
                 Logging.warning(ADFieldJobs.LOG_PREFIX .. "'%s' kunne ikke genstartes: %s", tostring(rig.label), tostring(started))
             elseif started then
-                local fieldId = ADFieldJobs.resumeField(rig.x, rig.z, rig.role, fields)
                 if fieldId ~= nil then
                     ADFieldJobs.state.assignments[rig.id] = {vehicleId = rig.id, vehicle = vehicle, fieldId = fieldId, role = rig.role,
                         stage = stageById[fieldId], helper = false, phase = "working", since = now(), width = rig.width,
diff --git a/FS25_ADSmartPickup/modDesc.xml b/FS25_ADSmartPickup/modDesc.xml
index c954356..725239c 100644
--- a/FS25_ADSmartPickup/modDesc.xml
+++ b/FS25_ADSmartPickup/modDesc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <modDesc descVersion="107">
     <author>masterdraco</author>
-    <version>1.38.4.0</version>
+    <version>1.38.5.0</version>
     <title>
         <en>AD Smart Pickup</en>
     </title>
diff --git a/tests/test_adFieldJobs.lua b/tests/test_adFieldJobs.lua
index 18e56e9..197aac3 100644
--- a/tests/test_adFieldJobs.lua
+++ b/tests/test_adFieldJobs.lua
@@ -143,5 +143,13 @@ check("SA ukendt fremdrift -> first", ADFieldJobs.startAtFor({stage = "harvestin
 check("SA klargøring (ingen afgrøde at måle) -> first", ADFieldJobs.startAtFor({stage = "cultivating", standingRatio = 0.3}), "first")
 check("SA husket waypoint uden eget kursus -> ikke last", ADFieldJobs.startAtFor({reuse = false, remembered = true, stage = "cultivating"}), "first")
 
+
+-- shouldResume: kun maskiner der stadig er midt i jobbet genstartes (in-game 27/9: to ROPA'er med et husket
+-- waypoint fra et gammelt job kørte ud ad vejene mod det gamle kursus)
+check("SR står på en mark i gang med sit trin -> ja", ADFieldJobs.shouldResume({fieldId = 111, distance = 400}), true)
+check("SR lige ved sit huskede waypoint -> ja", ADFieldJobs.shouldResume({distance = 12}), true)
+check("SR langt fra waypointet og ingen mark -> nej", ADFieldJobs.shouldResume({distance = 850}), false)
+check("SR ukendt afstand og ingen mark -> nej", ADFieldJobs.shouldResume({}), false)
+
 print(failures == 0 and "\nALLE TESTS OK" or ("\n" .. failures .. " FEJL"))
 os.exit(failures == 0 and 0 or 1)