diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5d952b..72198a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## In development
+### Bugfixes
+- Speed Provider Settings are now being saved for non GM players
+
+
 ## 1.3.2
 ### Translation
 - Updated japanese translation (thanks to togue)
diff --git a/src/settings.js b/src/settings.js
index c878668..7075681 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -111,6 +111,7 @@ class SpeedProviderSettings extends FormApplication {
 	}
 
 	async _updateObject(event, formData) {
+		const selectedSpeedProvider = game.user.isGM ? formData.speedProvider : game.settings.get(settingsKey, "speedProvider")
 		for (let [key, value] of Object.entries(formData)) {
 			// Check if this is color, convert the value to an integer
 			const splitKey = key.split(".", 3)
@@ -121,7 +122,7 @@ class SpeedProviderSettings extends FormApplication {
 			}
 
 			// Don't change settings for speed providers that aren't currently active
-			if (key !== "speedProvider" && !key.startsWith(formData.speedProvider))
+			if (key !== "speedProvider" && !key.startsWith(selectedSpeedProvider))
 				continue
 
 			// Get the key for the current setting