diff --git a/src/masterMacsAxis.cpp b/src/masterMacsAxis.cpp
index e1c3270..96b10af 100644
--- a/src/masterMacsAxis.cpp
+++ b/src/masterMacsAxis.cpp
@@ -329,10 +329,8 @@ asynStatus masterMacsAxis::doPoll(bool *moving) {
 
     // Does the axis need to be intialized?
     if (needInit()) {
-        rw_status = init();
-        if (rw_status != asynSuccess) {
-            return rw_status;
-        }
+	// Perform the rest of the poll, but remember if sth. failed in the init.
+        poll_status = init();
     }
 
     // Are we currently waiting for a handshake?