diff --git a/invesalius/gui/dialogs.py b/invesalius/gui/dialogs.py
index 8df4abe..c92f54a 100644
--- a/invesalius/gui/dialogs.py
+++ b/invesalius/gui/dialogs.py
@@ -3553,13 +3553,14 @@ class ObjectCalibrationDialog(wx.Dialog):
         # Called when the button for setting the object fiducial is enabled and either pedal is pressed
         # or the button is pressed again.
         #
-        def set_fiducial_callback():
-            Publisher.sendMessage('Set object fiducial', fiducial_index=index)
-            if self.pedal_connection is not None:
-                self.pedal_connection.remove_callback('fiducial')
-
-            ctrl.SetValue(False)
-            self.object_fiducial_being_set = None
+        def set_fiducial_callback(state):
+            if state:
+                Publisher.sendMessage('Set object fiducial', fiducial_index=index)
+                if self.pedal_connection is not None:
+                    self.pedal_connection.remove_callback('fiducial')
+
+                ctrl.SetValue(False)
+                self.object_fiducial_being_set = None
 
         if ctrl.GetValue():
             self.object_fiducial_being_set = index
diff --git a/invesalius/gui/task_navigator.py b/invesalius/gui/task_navigator.py
index ff5126d..ff3024b 100644
--- a/invesalius/gui/task_navigator.py
+++ b/invesalius/gui/task_navigator.py
@@ -684,14 +684,15 @@ class NeuronavigationPanel(wx.Panel):
         # Called when the button for setting the tracker fiducial is enabled and either pedal is pressed
         # or the button is pressed again.
         #
-        def set_fiducial_callback():
-            fiducial_name = const.TRACKER_FIDUCIALS[n]['fiducial_name']
-            Publisher.sendMessage('Set tracker fiducial', fiducial_name=fiducial_name)
-            if self.pedal_connection is not None:
-                self.pedal_connection.remove_callback('fiducial')
-
-            ctrl.SetValue(False)
-            self.tracker_fiducial_being_set = None
+        def set_fiducial_callback(state):
+            if state:
+                fiducial_name = const.TRACKER_FIDUCIALS[n]['fiducial_name']
+                Publisher.sendMessage('Set tracker fiducial', fiducial_name=fiducial_name)
+                if self.pedal_connection is not None:
+                    self.pedal_connection.remove_callback('fiducial')
+
+                ctrl.SetValue(False)
+                self.tracker_fiducial_being_set = None
 
         if ctrl.GetValue():
             self.tracker_fiducial_being_set = n
--
libgit2 0.21.2