diff --git a/server/player.lua b/server/player.lua
index d380257..40d5d89 100644
--- a/server/player.lua
+++ b/server/player.lua
@@ -111,7 +111,9 @@ function QBCore.Player.CheckPlayerData(source, PlayerData)
     PlayerData.job.name = PlayerData.job.name or 'unemployed'
     PlayerData.job.label = PlayerData.job.label or 'Civilian'
     PlayerData.job.payment = PlayerData.job.payment or 10
-    PlayerData.job.onduty = PlayerData.job.onduty or true
+    if QBCore.Shared.ForceJobDefaultDutyAtLogin or PlayerData.job.onduty == nil then
+        PlayerData.job.onduty = QBCore.Shared.Jobs[PlayerData.job.name].defaultDuty
+    end
     PlayerData.job.isboss = PlayerData.job.isboss or false
     PlayerData.job.grade = PlayerData.job.grade or {}
     PlayerData.job.grade.name = PlayerData.job.grade.name or 'Freelancer'
diff --git a/shared.lua b/shared.lua
index 4ef43d8..5da6375 100644
--- a/shared.lua
+++ b/shared.lua
@@ -607,6 +607,7 @@ QBShared.Gangs = {
 }
 
 -- Jobs
+QBShared.ForceJobDefaultDutyAtLogin = true -- true: Force duty state to jobdefaultDuty | false: set duty state from database last saved
 QBShared.Jobs = {
 	['unemployed'] = {
 		label = 'Civilian',