diff --git a/token-erc-1155/chaincode-go/chaincode/contract.go b/token-erc-1155/chaincode-go/chaincode/contract.go
index e05c8c85..72ef7e3c 100644
--- a/token-erc-1155/chaincode-go/chaincode/contract.go
+++ b/token-erc-1155/chaincode-go/chaincode/contract.go
@@ -1001,8 +1001,8 @@ func removeBalance(ctx contractapi.TransactionContextInterface, sender string, i
 				}
 			}
 
-		} else {
-			// Delete self recipient key
+		} else if selfRecipientKeyNeedsToBeRemoved {
+			// Delete self recipient key if required
 			err = ctx.GetStub().DelState(selfRecipientKey)
 			if err != nil {
 				return fmt.Errorf("failed to delete the state of %v: %v", selfRecipientKey, err)