diff --git a/src/octoprint/timelapse.py b/src/octoprint/timelapse.py
index 8bfe5deb..47d5b5de 100644
--- a/src/octoprint/timelapse.py
+++ b/src/octoprint/timelapse.py
@@ -443,10 +443,13 @@ class ZTimelapse(Timelapse):
 		Timelapse.process_post_roll(self)
 
 	def _on_z_change(self, event, payload):
-		diff = round(payload["new"] - payload["old"], 3)
-		zhop = round(self._retraction_zhop, 3)
-		if diff > 0 and diff != zhop:
+		if self._retraction_zhop == 0:
 			self.captureImage()
+		else:
+			diff = round(payload["new"] - payload["old"], 3)
+			zhop = round(self._retraction_zhop, 3)
+			if diff > 0 and diff != zhop:
+				self.captureImage()
 
 
 class TimedTimelapse(Timelapse):