diff --git a/src/turboPmacAxis.cpp b/src/turboPmacAxis.cpp
index a32fe38..b66af83 100644
--- a/src/turboPmacAxis.cpp
+++ b/src/turboPmacAxis.cpp
@@ -582,8 +582,10 @@ asynStatus turboPmacAxis::doPoll(bool *moving) {
     getAxisParamChecked(this, limFromHardware, &limFromHardware);
 
     if (limFromHardware != 0) {
-        setAxisParamChecked(this, motorHighLimitFromDriver, highLimit);
-        setAxisParamChecked(this, motorLowLimitFromDriver, lowLimit);
+        status = setLimits(highLimit, lowLimit);
+        if (status != asynSuccess) {
+            return status;
+        }
     }
 
     status = setMotorPosition(currentPosition);