diff --git a/octoprint_dashboard/__init__.py b/octoprint_dashboard/__init__.py
index 5ca4f19..01bddeb 100644
--- a/octoprint_dashboard/__init__.py
+++ b/octoprint_dashboard/__init__.py
@@ -110,10 +110,12 @@ def get_update_information(self):
     
     def process_gcode(self, comm_instance, phase, cmd, cmd_type, gcode, *args, **kwargs):
         #self._logger.info("GCODE: " + cmd)
-        if cmd.startswith("M117 INDICATOR-Layer"):
+        #if cmd.startswith("M117 INDICATOR-Layer"):
             #self._logger.info("LAYER CHANGE")
+            #return
+        if not gcode:
             return
-        else:
+        if gcode in ("G0", "G1"):
             CmdDict = dict ((x,float(y)) for d,x,y in (re.split('([A-Z])', i) for i in cmd.upper().split()))
             if "E" in CmdDict:
                 e = float(CmdDict["E"]) / 1000 #in meters
@@ -131,7 +133,7 @@ def __plugin_load__():
     global __plugin_hooks__
     __plugin_hooks__ = {
         "octoprint.plugin.softwareupdate.check_config": __plugin_implementation__.get_update_information,
-        "octoprint.comm.protocol.gcode.queuing": __plugin_implementation__.process_gcode
+        "octoprint.comm.protocol.gcode.queued": __plugin_implementation__.process_gcode
     }
 
 
diff --git a/setup.py b/setup.py
index 7c3500f..ffcfbd8 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 plugin_name = "OctoPrint-Dashboard"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "1.6.0"
+plugin_version = "1.6.1"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module