diff --git a/dispenser/dispenserclient.go b/dispenser/dispenserclient.go
index 2fc9278..336972d 100644
--- a/dispenser/dispenserclient.go
+++ b/dispenser/dispenserclient.go
@@ -279,7 +279,9 @@ func (c *Client) DispenserStart(ctx context.Context) (string, error) {
 		return stockStatus, fmt.Errorf("[%s] check status: %w", funcName, err)
 	}
 
-	logStatus(status)
+	defer func() {
+		logStatus(status)
+	}()
 	stockStatus = stockTake(status)
 	c.setStock(status)
 
@@ -294,48 +296,77 @@ func (c *Client) DispenserStart(ctx context.Context) (string, error) {
 		return stockStatus, fmt.Errorf("[%s] to encoder: %w", funcName, err)
 	}
 
-	time.Sleep(delay)
-	status, err = c.CheckStatus(ctx)
-	if err != nil {
-		return stockStatus, fmt.Errorf("[%s] re-check status: %w", funcName, err)
-	}
-	logStatus(status)
-	stockStatus = stockTake(status)
-	c.setStock(status)
+	deadline := time.Now().Add(3 * time.Second)
 
-	return stockStatus, nil
+	for {
+		if time.Now().After(deadline) {
+			return stockStatus, fmt.Errorf("[%s] timeout waiting keycard at encoder position", funcName)
+		}
+
+		status, err = c.do(ctx, cmdStatus)
+		if err != nil {
+			return stockStatus, fmt.Errorf("[%s] re-check status: %w", funcName, err)
+		}
+
+		stockStatus = stockTake(status)
+		c.setStock(status)
+
+		// error states first
+		if isCardWellEmpty(status) {
+			return stockStatus, fmt.Errorf(stockStatus)
+		}
+
+		if isAtEncoderPosition(status) {
+			return stockStatus, nil
+		}
+
+		time.Sleep(100 * time.Millisecond)
+	}
 }
 
 func (c *Client) DispenserFinal(ctx context.Context) (string, error) {
 	const funcName = "DispenserFinal"
 	stockStatus := ""
+	var status []byte
 
 	if err := c.OutOfMouth(ctx); err != nil {
 		return stockStatus, fmt.Errorf("[%s] out of mouth: %w", funcName, err)
 	}
 
-	time.Sleep(delay)
-	status, err := c.CheckStatus(ctx)
-	if err != nil {
-		return stockStatus, fmt.Errorf("[%s] check status: %w", funcName, err)
-	}
-	logStatus(status)
-	stockStatus = stockTake(status)
-	c.setStock(status)
+	time.Sleep(200 * time.Millisecond)
 
-	time.Sleep(delay)
 	if err := c.ToEncoder(ctx); err != nil {
 		return stockStatus, fmt.Errorf("[%s] to encoder: %w", funcName, err)
 	}
 
-	time.Sleep(delay)
-	status, err = c.CheckStatus(ctx)
-	if err != nil {
-		return stockStatus, fmt.Errorf("[%s] re-check status: %w", funcName, err)
-	}
-	logStatus(status)
-	stockStatus = stockTake(status)
-	c.setStock(status)
+	defer func() {
+		logStatus(status)
+	}()
+
+	deadline := time.Now().Add(3 * time.Second)
+
+	for {
+		if time.Now().After(deadline) {
+			return stockStatus, nil
+		}
+
+		status, err := c.do(ctx, cmdStatus)
+		if err != nil {
+			return stockStatus, nil
+		}
+
+		stockStatus = stockTake(status)
+		c.setStock(status)
+
+		if isCardWellEmpty(status) {
+			return stockStatus, fmt.Errorf(stockStatus)
+		}
+
+		if isAtEncoderPosition(status) {
+			return stockStatus, nil
+		}
+
+		time.Sleep(100 * time.Millisecond)
+	}
 
-	return stockStatus, nil
 }
diff --git a/main.go b/main.go
index 2664aa1..e98af9e 100644
--- a/main.go
+++ b/main.go
@@ -29,7 +29,7 @@ import (
 )
 
 const (
-	buildVersion     = "1.2.2"
+	buildVersion     = "1.2.3"
 	serviceName      = "hardlink"
 	pollingFrequency = 8 * time.Second
 )
diff --git a/release notes.md b/release notes.md
index 9a2165c..ef45fc8 100644
--- a/release notes.md	
+++ b/release notes.md	
@@ -2,6 +2,9 @@
 
 builtVersion is a const in main.go
 
+#### 1.2.3 - 17 March 2026
+added check if keycard at the encoder position before trying to encode key
+
 #### 1.2.2 - 11 February 2026
 increased waiting time befor sending email on PDQ unavailability to 30 seconds day time and 10 minutes night time
 to give it a chance to become available again