diff --git a/mission/system/tcs/TmpDevFdir.cpp b/mission/system/tcs/TmpDevFdir.cpp
index d501dd1a..8123debc 100644
--- a/mission/system/tcs/TmpDevFdir.cpp
+++ b/mission/system/tcs/TmpDevFdir.cpp
@@ -29,7 +29,9 @@ ReturnValue_t TmpDevFdir::eventReceived(EventMessage* event) {
     case DeviceHandlerIF::DEVICE_BUILDING_COMMAND_FAILED:
       // These faults all mean that there were stupid replies from a device.
       // With now way to do a recovery, set the device to faulty immediately.
-      setFaulty(event->getEvent());
+      if (strangeReplyCount.incrementAndCheck()) {
+        setFaulty(event->getEvent());
+      }
       break;
     case DeviceHandlerIF::DEVICE_SENDING_COMMAND_FAILED:
     case DeviceHandlerIF::DEVICE_REQUESTING_REPLY_FAILED: