diff --git a/src/octoprint/util/comm_acc.py b/src/octoprint/util/comm_acc.py
index f4bef674..da23ce64 100644
--- a/src/octoprint/util/comm_acc.py
+++ b/src/octoprint/util/comm_acc.py
@@ -1003,7 +1003,7 @@ class MachineCom(object):
 						eventManager().fire(Events.ERROR, {"error": self.getErrorString()})
 
 					if("Grbl" in line):
-						versionMatch = re.search("Grbl (?P<grbl>.+)(_(?P<git>[0-9a-f]{7})(?P<dirty>-dirty)?)? \[.+\]", line)
+						versionMatch = re.search("Grbl (?P<grbl>.+?)(_(?P<git>[0-9a-f]{7})(?P<dirty>-dirty)?)? \[.+\]", line)
 						if(versionMatch):
 							versionDict = versionMatch.groupdict()
 							self._writeGrblVersionToFile(versionDict)