diff --git a/src/octoprint/plugins/svgtogcode/static/js/convert.js b/src/octoprint/plugins/svgtogcode/static/js/convert.js
index b92456ce..7c6c9c4f 100644
--- a/src/octoprint/plugins/svgtogcode/static/js/convert.js
+++ b/src/octoprint/plugins/svgtogcode/static/js/convert.js
@@ -48,11 +48,14 @@ $(function(){
 			self.gcodeFilename(gcodeFile);
 			
 			if(self.svg !== undefined){
-				var intensity = self.settings.settings.plugins.svgtogcode.defaultIntensity();
-				var speed = self.settings.settings.plugins.svgtogcode.defaultFeedrate();
-				self.laserIntensity(intensity);
-				self.laserSpeed(speed);
-
+				if(self.laserIntensity() === undefined){
+					var intensity = self.settings.settings.plugins.svgtogcode.defaultIntensity();
+					self.laserIntensity(intensity);
+				} 
+				if(self.laserSpeed() === undefined){
+					var speed = self.settings.settings.plugins.svgtogcode.defaultFeedrate();
+					self.laserSpeed(speed);
+				}
 
 				// TODO: js svg conversion
 				self.title(gettext("Converting"));