diff --git a/lib/farmbot/firmware/firmware.ex b/lib/farmbot/firmware/firmware.ex
index e456bbc1..37f8264e 100644
--- a/lib/farmbot/firmware/firmware.ex
+++ b/lib/farmbot/firmware/firmware.ex
@@ -272,6 +272,21 @@ defmodule Farmbot.Firmware do
     {:informational_settings, %{firmware_version: version}, state}
   end
 
+  defp handle_gcode(:report_axis_home_complete_x, state) do
+    Logger.success 3, "X Axis homing complete."
+    {nil, state}
+  end
+
+  defp handle_gcode(:report_axis_home_complete_y, state) do
+    Logger.success 3, "Y Axis homing complete."
+    {nil, state}
+  end
+
+  defp handle_gcode(:report_axis_home_complete_z, state) do
+    Logger.success 3, "Z Axis homing complete."
+    {nil, state}
+  end
+
   defp handle_gcode(:busy, state) do
     Farmbot.BotState.set_busy(true)
     {:informational_settings, %{busy: true}, %{state | idle: false}}
diff --git a/lib/farmbot/firmware/stub_handler.ex b/lib/farmbot/firmware/stub_handler.ex
index 71a3da96..d930a2e8 100644
--- a/lib/farmbot/firmware/stub_handler.ex
+++ b/lib/farmbot/firmware/stub_handler.ex
@@ -112,9 +112,9 @@ defmodule Farmbot.Firmware.StubHandler do
   def handle_call({:home, axis, _speed}, _from, state) do
     state = %{state | pos: %{state.pos | axis => 0}}
     case axis do
-      :x -> {:reply, :ok, [{:report_current_position, 0, state.pos.y, state.pos.z}, :done], state}
-      :y -> {:reply, :ok, [{:report_current_position, state.pos.x, 0, state.pos.z}, :done], state}
-      :z -> {:reply, :ok, [{:report_current_position, state.pos.x, state.pos.y, 0}, :done], state}
+      :x -> {:reply, :ok, [:report_axis_home_complete_x, {:report_current_position, 0, state.pos.y, state.pos.z}, :done], state}
+      :y -> {:reply, :ok, [:report_axis_home_complete_y, {:report_current_position, state.pos.x, 0, state.pos.z}, :done], state}
+      :z -> {:reply, :ok, [:report_axis_home_complete_z, {:report_current_position, state.pos.x, state.pos.y, 0}, :done], state}
     end
   end