diff --git a/XilinxProcessorIPLib/drivers/hdcp1x/src/xhdcp1x_cipher.c b/XilinxProcessorIPLib/drivers/hdcp1x/src/xhdcp1x_cipher.c
index f3d9bbe1..799fa5d0 100644
--- a/XilinxProcessorIPLib/drivers/hdcp1x/src/xhdcp1x_cipher.c
+++ b/XilinxProcessorIPLib/drivers/hdcp1x/src/xhdcp1x_cipher.c
@@ -268,9 +268,6 @@ int XHdcp1x_CipherDisable(XHdcp1x *InstancePtr)
 	XHdcp1x_WriteReg(InstancePtr->Config.BaseAddress,
 		XHDCP1X_CIPHER_REG_CONTROL, Value);
 
-	/* Wait until the XOR has actually stopped */
-	while (XHdcp1x_CipherXorInProgress(InstancePtr));
-
 	return (XST_SUCCESS);
 }
 
@@ -692,11 +689,6 @@ int XHdcp1x_CipherDisableEncryption(XHdcp1x *InstancePtr, u64 StreamMap)
 	XHdcp1x_WriteReg(InstancePtr->Config.BaseAddress,
 		XHDCP1X_CIPHER_REG_CONTROL, Val);
 
-	/* If disabling the XOR, wait until no longer in progress */
-	if (DisableXor) {
-		while (XHdcp1x_CipherXorInProgress(InstancePtr));
-	}
-
 	return (XST_SUCCESS);
 }